From d617efc5ef1af2c6fa563c7b1aeeed911d7886a4 Mon Sep 17 00:00:00 2001 From: Glenn Rice Date: Sat, 7 Sep 2013 12:40:40 -0500 Subject: [PATCH] When checking for glew, don't fail if a working system version is not found so we can fall back to the Externals version. --- CMakeLists.txt | 4 ++-- CMakeTests/FindGLEW.cmake | 3 --- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f2571e824b..48504d66af 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -648,11 +648,11 @@ else() if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") include(FindGLEW) endif() - if(NOT GLEW_FOUND) + if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS) message("Using static GLEW from Externals") add_subdirectory(Externals/GLew) include_directories(Externals/GLew/include) - endif(NOT GLEW_FOUND) + endif() endif() endif() diff --git a/CMakeTests/FindGLEW.cmake b/CMakeTests/FindGLEW.cmake index 33c60d0439..cb1e09021a 100644 --- a/CMakeTests/FindGLEW.cmake +++ b/CMakeTests/FindGLEW.cmake @@ -28,8 +28,5 @@ if(GLEW_FOUND) if (GLEW_HAS_1_9_METHODS) include_directories(${GLEW_INCLUDE_DIRS}) message("GLEW found") - else() - set($GLEW_FOUND 0 CACHE INTERNAL "") - message(FATAL_ERROR "A version of GLEW with the required methods was not found") endif() endif()