[Bf-blender-cvs] [30add95] blender-v2.75-release: CMake: minor edits to lite config

Campbell Barton noreply at git.blender.org
Thu Jun 18 17:38:24 CEST 2015


Commit: 30add95104e1cdcaf7faa1f17b59b470a6134983
Author: Campbell Barton
Date:   Sun Jun 14 09:34:42 2015 +1000
Branches: blender-v2.75-release
https://developer.blender.org/rB30add95104e1cdcaf7faa1f17b59b470a6134983

CMake: minor edits to lite config

===================================================================

M	CMakeLists.txt
M	build_files/cmake/config/blender_lite.cmake

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 176d13b..3144376 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -654,6 +654,11 @@ endif()
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
 	set(WITH_OPENIMAGEIO ON)
+
+	# auto enable llvm for cycles_osl
+	if(WITH_CYCLES_OSL)
+		set(WITH_LLVM ON CACHE BOOL "" FORCE)
+	endif()
 endif()
 
 # auto enable openimageio linking dependencies
@@ -662,11 +667,6 @@ if(WITH_OPENIMAGEIO)
 	set(WITH_IMAGE_TIFF ON)
 endif()
 
-# auto enable llvm for cycles_osl
-if(WITH_CYCLES_OSL)
-	set(WITH_LLVM ON CACHE BOOL "" FORCE)
-endif()
-
 # don't store paths to libs for portable distribution
 if(WITH_INSTALL_PORTABLE)
 	set(CMAKE_SKIP_BUILD_RPATH TRUE)
diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake
index 3a70201..2a57e4c 100644
--- a/build_files/cmake/config/blender_lite.cmake
+++ b/build_files/cmake/config/blender_lite.cmake
@@ -16,6 +16,7 @@ set(WITH_CODEC_SNDFILE       OFF CACHE BOOL "" FORCE)
 set(WITH_CYCLES              OFF CACHE BOOL "" FORCE)
 set(WITH_FFTW3               OFF CACHE BOOL "" FORCE)
 set(WITH_LIBMV               OFF CACHE BOOL "" FORCE)
+set(WITH_LLVM                OFF CACHE BOOL "" FORCE)
 set(WITH_GAMEENGINE          OFF CACHE BOOL "" FORCE)
 set(WITH_COMPOSITOR          OFF CACHE BOOL "" FORCE)
 set(WITH_FREESTYLE           OFF CACHE BOOL "" FORCE)




More information about the Bf-blender-cvs mailing list