diff options
Diffstat (limited to 'tests/FindGLEW.cmake')
| -rw-r--r-- | tests/FindGLEW.cmake | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/tests/FindGLEW.cmake b/tests/FindGLEW.cmake index edf590c..c2dc6a2 100644 --- a/tests/FindGLEW.cmake +++ b/tests/FindGLEW.cmake @@ -23,26 +23,14 @@ 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) |