CMake: minor edits to lite config
authorCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2015 23:34:42 +0000 (09:34 +1000)
committerCampbell Barton <ideasman42@gmail.com>
Sat, 13 Jun 2015 23:34:42 +0000 (09:34 +1000)
CMakeLists.txt
build_files/cmake/config/blender_lite.cmake

index 176d13b86afa6290eea1c26b6dd6a9f3266f63c8..3144376dd8078cb7520222b309e51cfabdbbfc57 100644 (file)
@@ -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)
index 3a702014baef62a3c70676047d2109efd879c54b..2a57e4c33d886df250df8d5e49487149d5174b2b 100644 (file)
@@ -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)