Commit 7feb9460 authored by Kenneth Moreland's avatar Kenneth Moreland

Merge branch 'update-find-glfw' into 'master'

Update finding glfw

See merge request !8
parents 77c708f9 b40ee3fb
...@@ -25,14 +25,15 @@ OpenGL contexts. Supported values are GLUT and GLFW." ...@@ -25,14 +25,15 @@ OpenGL contexts. Supported values are GLUT and GLFW."
MESSAGE(STATUS "Cannot find GLUT library. OpenGL tests disabled.") MESSAGE(STATUS "Cannot find GLUT library. OpenGL tests disabled.")
ENDIF (GLUT_FOUND) ENDIF (GLUT_FOUND)
ELSEIF (ICET_OPENGL_WINDOW_LIBRARY STREQUAL GLFW) ELSEIF (ICET_OPENGL_WINDOW_LIBRARY STREQUAL GLFW)
FIND_PACKAGE(GLFW) FIND_PACKAGE(glfw3)
IF (GLFW_FOUND) IF (glfw3_FOUND)
INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIR}) #INCLUDE_DIRECTORIES(${GLFW_INCLUDE_DIR})
SET(GLFW_LIBRARY glfw)
SET(ICET_TESTS_USE_OPENGL 1) SET(ICET_TESTS_USE_OPENGL 1)
SET(ICET_TESTS_USE_GLFW 1) SET(ICET_TESTS_USE_GLFW 1)
ELSE (GLFW_FOUND) ELSE (glfw3_FOUND)
MESSAGE(WARNING "Cannot find GLFW library. OpenGL tests disabled.") MESSAGE(WARNING "Cannot find GLFW library. OpenGL tests disabled.")
ENDIF (GLFW_FOUND) ENDIF (glfw3_FOUND)
ELSE () ELSE ()
MESSAGE(SEND_ERROR "Invalid value for ICET_OPENGL_WINDOW_LIBRARY: ${ICET_OPENGL_WINDOW_LIBRARY}") MESSAGE(SEND_ERROR "Invalid value for ICET_OPENGL_WINDOW_LIBRARY: ${ICET_OPENGL_WINDOW_LIBRARY}")
ENDIF () ENDIF ()
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment