summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordon bright <hugh.m.bright@gmail.com>2013-01-29 04:20:55 (GMT)
committerdon bright <hugh.m.bright@gmail.com>2013-01-29 04:20:55 (GMT)
commit600893dd74ba241eb65722e929d847dc5b0c282f (patch)
treedc4f38791df3e2e4109414d6796a1d8ad0be91d2
parentc08760519354f9a65a8950d0f482d34180e8b376 (diff)
fix bug report in glew finder
-rw-r--r--tests/FindGLEW.cmake10
1 files changed, 4 insertions, 6 deletions
diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake
index 8fa2ac2..674741d 100644
--- a/tests/FindGLEW.cmake
+++ b/tests/FindGLEW.cmake
@@ -35,23 +35,21 @@ if (WIN32)
else()
find_path(GLEW_INCLUDE_DIR GL/glew.h
PATHS /usr/include /usr/local/include /usr/pkg/include
- NO_DEFAULT_PATH
DOC "The directory where GL/glew.h resides")
find_library(GLEW_LIBRARY
NAMES GLEW glew
PATHS /usr/lib /usr/local/lib /usr/pkg/lib /lib /lib64 /usr/lib64
- NO_DEFAULT_PATH
DOC "The GLEW library")
endif()
-if (GLEW_INCLUDE_DIR AND GLEW_LIBRARY)
- set(GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
-else()
+if ("${GLEW_INCLUDE_DIR}" STREQUAL "" AND "${GLEW_LIBRARY}" STREQUAL "")
set(GLEW_FOUND 0 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
+else()
+ set(GLEW_FOUND 1 CACHE STRING "Set to 1 if GLEW is found, 0 otherwise")
endif()
if (NOT GLEW_FOUND)
- include(FindPkgConfig.cmake)
+ find_package(PkgConfig REQUIRED)
if (PKG_CONFIG_FOUND)
message(STATUS "Doing pkg config glew check...")
pkg_search_module(GLEW glew)
contact: Jan Huwald // Impressum