diff options
| author | don bright <hugh.m.bright@gmail.com> | 2013-01-28 04:15:38 (GMT) |
|---|---|---|
| committer | don bright <hugh.m.bright@gmail.com> | 2013-01-28 04:15:38 (GMT) |
| commit | d09e0e7f420da11c2cbc91a5afeeec98896f66bd (patch) | |
| tree | c091f81fb1646021b247c5326bfdd22dd44cc032 | |
| parent | 9f83c8ffe71c12f0134e54e897a5a828dd7ec512 (diff) | |
fix pkg-config to actually work
| -rw-r--r-- | tests/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/FindGLEW.cmake | 15 |
2 files changed, 11 insertions, 9 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index 9f41682..84e5099 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -299,8 +299,6 @@ if (GLEW_DIR) HINTS ${GLEW_DIR}/lib ${GLEW_DIR}/lib64 NO_DEFAULT_PATH) if (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) - message(STATUS "GLEW include: " ${GLEW_INCLUDE_DIR}) - message(STATUS "GLEW library: " ${GLEW_LIBRARY}) set(GLEW_FOUND 1) endif() endif() @@ -309,6 +307,9 @@ if (NOT GLEW_FOUND) find_package(GLEW REQUIRED) endif() +message(STATUS "GLEW include: " ${GLEW_INCLUDE_DIR}) +message(STATUS "GLEW library: " ${GLEW_LIBRARY}) + inclusion(GLEW_DIR GLEW_INCLUDE_DIR) # Flex/Bison diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index f571fe2..8fa2ac2 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -46,18 +46,19 @@ endif() if (GLEW_INCLUDE_DIR AND GLEW_LIBRARY) set(GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") - message(STATUS "GLEW include found in " ${GLEW_INCLUDE_DIR} ) - message(STATUS "GLEW library found in " ${GLEW_LIBRARY} ) else() set(GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise") endif() if (NOT GLEW_FOUND) - message("Doing pkg config glew check...") - pkg_check_modules(GLEW glew>=1.6) - if (GLEW_FOUND) - set(GLEW_INCLUDE_DIR "${GLEW_INCLUDEDIR}") - set(GLEW_LIBRARY ${GLEW_LDFLAGS}) + include(FindPkgConfig.cmake) + if (PKG_CONFIG_FOUND) + message(STATUS "Doing pkg config glew check...") + pkg_search_module(GLEW glew) + if (GLEW_FOUND) + set(GLEW_INCLUDE_DIR "${GLEW_INCLUDEDIR}") + set(GLEW_LIBRARY "-L${GLEW_LIBRARY_DIRS} -l${GLEW_LIBRARIES}") + endif() endif() endif() |