diff options
| author | Marius Kintel <marius@kintel.net> | 2012-02-18 15:57:24 (GMT) |
|---|---|---|
| committer | Marius Kintel <marius@kintel.net> | 2012-02-18 15:57:24 (GMT) |
| commit | 79d9fdba3256cf7e60d6d00e92b0f46160bcf45b (patch) | |
| tree | d55883ecb4b2cd41cf5c86533d34157a6677eebf | |
| parent | d460e7203fe8ce8c799a1558351e374218e1222a (diff) | |
GLEW fix: Support GLEW installed in the default system location
| -rw-r--r-- | tests/CMakeLists.txt | 9 | ||||
| -rw-r--r-- | tests/FindGLEW.cmake | 6 |
2 files changed, 7 insertions, 8 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index ad3eefe..c395a52 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -239,15 +239,14 @@ if (NOT GLEW_INCLUDE_DIR) NAMES GLEW glew HINTS ${GLEW_DIR}/lib NO_DEFAULT_PATH) - if (NOT GLEW_INCLUDE_DIR OR NOT GLEW_LIBRARY) + if (NOT GLEW_LIBRARY) find_package(GLEW REQUIRED) - if (NOT GLEW_INCLUDE_DIR OR NOT GLEW_LIBRARY) + if (NOT GLEW_LIBRARY) message(FATAL_ERROR "GLEW not found") endif() - else() - message(STATUS "GLEW include found in " ${GLEW_INCLUDE_DIR}) - message(STATUS "GLEW library found in " ${GLEW_LIBRARY}) endif() + message(STATUS "GLEW include: " ${GLEW_INCLUDE_DIR}) + message(STATUS "GLEW library: " ${GLEW_LIBRARY}) endif() inclusion(GLEW_DIR GLEW_INCLUDE_DIR) diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index b7e37d0..a503368 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -17,9 +17,9 @@ if (PKG_CONFIG_FOUND) pkg_check_modules(GLEW glew>=1.5) endif() -if (GLEW_FOUND) - set(GLEW_INCLUDE_DIR ${GLEW_INCLUDE_DIRS}) - set(GLEW_LIBRARY ${GLEW_LDFLAGS}) +if (GLEW_LIBRARIES) + set(GLEW_INCLUDE_DIR "${GLEW_INCLUDE_DIRS}") + set(GLEW_LIBRARY ${GLEW_LDFLAGS}) else() if (WIN32 AND MSVC) if (WIN32_STATIC_BUILD) # passed from caller |