[Bf-blender-cvs] [8bc84e1] master: CMake: correct own error using undefined var
Campbell Barton
noreply at git.blender.org
Wed Nov 26 13:27:03 CET 2014
Commit: 8bc84e10f501e516e0839b6a3efa573d55fb4f7b
Author: Campbell Barton
Date: Wed Nov 26 13:24:56 2014 +0100
Branches: master
https://developer.blender.org/rB8bc84e10f501e516e0839b6a3efa573d55fb4f7b
CMake: correct own error using undefined var
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5120cc4..87ee852 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -178,6 +178,15 @@ if(UNIX AND NOT APPLE)
set(_init_GAMEENGINE OFF)
endif()
+
+#-----------------------------------------------------------------------------
+# Options
+
+# First platform spesific non-cached vars
+if(UNIX AND NOT APPLE)
+ set(WITH_X11 ON)
+endif()
+
# Blender internal features
option(WITH_BLENDER "Build blender (disable to build only the blender player)" ON)
mark_as_advanced(WITH_BLENDER)
@@ -233,10 +242,6 @@ mark_as_advanced(WITH_AUDASPACE)
option(WITH_OPENMP "Enable OpenMP (has to be supported by the compiler)" ON)
-if(UNIX AND NOT APPLE)
- set(WITH_X11 ON)
-endif()
-
if(WITH_X11)
option(WITH_X11_XINPUT "Enable X11 Xinput (tablet support and unicode input)" ON)
option(WITH_X11_XF86VMODE "Enable X11 video mode switching" ON)
More information about the Bf-blender-cvs
mailing list