diff options
Diffstat (limited to 'tests/FindGLEW.cmake')
| -rw-r--r-- | tests/FindGLEW.cmake | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index e058e8c..edf590c 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -7,6 +7,9 @@ # GLEW_LIBRARY # +# a few lines of this file are based on the LGPL code found at +# http://openlibraries.org/browser/trunk/FindGLEW.cmake?rev=1383 + IF (WIN32) FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h $ENV{PROGRAMFILES}/GLEW/include @@ -20,14 +23,26 @@ IF (WIN32) ${PROJECT_SOURCE_DIR}/src/nvgl/glew/lib DOC "The GLEW library") ELSE (WIN32) +<<<<<<< HEAD + MESSAGE( "-- GLEW_DIR value:" ${GLEW_DIR}) + FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h + PATHS /usr/include /usr/local/include + ${GLEW_DIR}/include +======= message("GLEW_DIR: " ${GLEW_DIR}) FIND_PATH( GLEW_INCLUDE_PATH GL/glew.h PATHS ${GLEW_DIR}/include /usr/include /usr/local/include +>>>>>>> upstream/visitor NO_DEFAULT_PATH DOC "The directory where GL/glew.h resides") FIND_LIBRARY( GLEW_LIBRARY NAMES GLEW glew +<<<<<<< HEAD + PATHS /usr/lib /usr/local/lib + ${GLEW_DIR}/lib +======= PATHS ${GLEW_DIR}/lib /usr/lib /usr/local/lib +>>>>>>> upstream/visitor NO_DEFAULT_PATH DOC "The GLEW library") ENDIF (WIN32) |