From 8bc84e10f501e516e0839b6a3efa573d55fb4f7b Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Wed, 26 Nov 2014 13:24:56 +0100 Subject: [PATCH] CMake: correct own error using undefined var --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 5120cc4e657..87ee8526fc9 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)