diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 17:42:14 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2012-06-23 17:42:14 +0400 |
| commit | 263be14811c65ee67646308b116c6afd8f817384 (patch) | |
| tree | 865b7542c21bcdd6030d8209d9a264447dc2c338 /CMakeLists.txt | |
| parent | 79fb3311a3397ddf6b1a3e0e10b4dc0f4fee4d70 (diff) | |
rename WITH_BUILTIN_GLEW, WITH_SYSTEM_GLEW & negate.
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 824ccc72244..b983a5556f6 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -159,7 +159,7 @@ unset(PLATFORM_DEFAULT) if(UNIX AND NOT APPLE) option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON) option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON) - option(WITH_BUILTIN_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) + option(WITH_SYSTEM_GLEW "Use GLEW OpenGL wrapper library bundled with blender" ON) # freebsd doesn't seems to support XDND if(NOT ${CMAKE_SYSTEM_NAME} MATCHES "FreeBSD") @@ -167,7 +167,7 @@ if(UNIX AND NOT APPLE) endif() else() # not an option for other OS's - set(WITH_BUILTIN_GLEW ON) + set(WITH_SYSTEM_GLEW OFF) endif() # Modifiers @@ -1540,20 +1540,20 @@ endif() #----------------------------------------------------------------------------- # Configure GLEW -if(WITH_BUILTIN_GLEW) - # set(GLEW_LIBRARY "") # unused - set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include") -else() +if(WITH_SYSTEM_GLEW) find_package(GLEW) if(NOT GLEW_FOUND) - message(FATAL_ERROR "GLEW is required to build blender, install it or use WITH_BUILTIN_GLEW") + message(FATAL_ERROR "GLEW is required to build blender, install it or disable WITH_SYSTEM_GLEW") endif() mark_as_advanced( GLEW_LIBRARY GLEW_INCLUDE_PATH ) +else() + # set(GLEW_LIBRARY "") # unused + set(GLEW_INCLUDE_PATH "${CMAKE_SOURCE_DIR}/extern/glew/include") endif() #----------------------------------------------------------------------------- @@ -1791,7 +1791,7 @@ if(FIRST_RUN) info_cfg_option(WITH_INSTALL_PORTABLE) info_cfg_option(WITH_X11_XF86VMODE) info_cfg_option(WITH_X11_XINPUT) - info_cfg_option(WITH_BUILTIN_GLEW) + info_cfg_option(WITH_SYSTEM_GLEW) info_cfg_option(WITH_MEM_JEMALLOC) info_cfg_text("Image Formats:") |