diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2015-06-14 02:34:42 +0300 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2015-06-18 18:32:25 +0300 |
| commit | 30add95104e1cdcaf7faa1f17b59b470a6134983 (patch) | |
| tree | 5596c0e21abda04b798ccb70bf3565ea4e37ca43 | |
| parent | d9b43081b6eea61fb749d565e1d0c56b709b19b8 (diff) | |
CMake: minor edits to lite config
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | build_files/cmake/config/blender_lite.cmake | 1 |
2 files changed, 6 insertions, 5 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 176d13b86af..3144376dd80 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 3a702014bae..2a57e4c33d8 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) |