[Bf-blender-cvs] [c691ab1] blender-v2.75-release: CMake: disable OSL if cycles is disabled
Campbell Barton
noreply at git.blender.org
Thu Jun 18 17:38:26 CEST 2015
Commit: c691ab1572af9c2ae5c5912191fcc69bcd3803fd
Author: Campbell Barton
Date: Sun Jun 14 09:50:33 2015 +1000
Branches: blender-v2.75-release
https://developer.blender.org/rBc691ab1572af9c2ae5c5912191fcc69bcd3803fd
CMake: disable OSL if cycles is disabled
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3144376..1f0be6c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -659,6 +659,8 @@ if(WITH_CYCLES)
if(WITH_CYCLES_OSL)
set(WITH_LLVM ON CACHE BOOL "" FORCE)
endif()
+else()
+ set(WITH_CYCLES_OSL OFF)
endif()
# auto enable openimageio linking dependencies
More information about the Bf-blender-cvs
mailing list