mirrors/dolphin-emulator
1
0
Fork 0
mirror of https://github.com/dolphin-emu/dolphin.git synced 2025-05-28 14:56:35 +00:00
Code Issues Projects Releases Packages Wiki Activity

When checking for glew, don't fail if a working system version is not

Browse source 
found so we can fall back to the Externals version.
This commit is contained in:
Glenn Rice 2013-09-07 12:40:40 -05:00
parent a3d86ceead
commit d617efc5ef
2 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
CMakeLists.txt
View file

@ -648,11 +648,11 @@ else()
if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin") if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "Darwin")
include(FindGLEW) include(FindGLEW)
endif() endif()
if(NOT GLEW_FOUND) if(NOT GLEW_FOUND OR NOT GLEW_HAS_1_9_METHODS)
message("Using static GLEW from Externals") message("Using static GLEW from Externals")
add_subdirectory(Externals/GLew) add_subdirectory(Externals/GLew)
include_directories(Externals/GLew/include) include_directories(Externals/GLew/include)
endif(NOT GLEW_FOUND) endif()
endif() endif()
endif() endif()

3
CMakeTests/FindGLEW.cmake
View file

@ -28,8 +28,5 @@ if(GLEW_FOUND)
if (GLEW_HAS_1_9_METHODS) if (GLEW_HAS_1_9_METHODS)
include_directories(${GLEW_INCLUDE_DIRS}) include_directories(${GLEW_INCLUDE_DIRS})
message("GLEW found") 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()
endif() endif()