diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-12 18:50:43 +0300 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2016-01-14 11:12:50 +0300 |
commit | 5af103fe008aac0cb20631871bbee16f319835ed (patch) | |
tree | 08ab45df99aa186e4180505b39138812fef697f8 /intern | |
parent | 16b7887b33b0057830e888de394f4bc08a9d325b (diff) |
Cycles: Reduce scope of some defines set in CMakeLists
Should be no functional changes at all, just speeds up re-compilation
when some features needs to be disabled for development purposes.
For example, when running lots of Valgrind it's handy to disable any
GPU devices because otherwise you'll be wasting quite some time in
the driver while enumerating devices.
Reviewers: dingto, lukasstockner97, brecht, juicyfruit
Differential Revision: https://developer.blender.org/D1730
Diffstat (limited to 'intern')
-rw-r--r-- | intern/cycles/CMakeLists.txt | 16 | ||||
-rw-r--r-- | intern/cycles/blender/CMakeLists.txt | 4 | ||||
-rw-r--r-- | intern/cycles/device/CMakeLists.txt | 12 | ||||
-rw-r--r-- | intern/cycles/subd/CMakeLists.txt | 4 |
4 files changed, 23 insertions, 13 deletions
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt index c118f4cd015..6d1c6bf6c95 100644 --- a/intern/cycles/CMakeLists.txt +++ b/intern/cycles/CMakeLists.txt @@ -126,10 +126,6 @@ add_definitions( -DCCL_NAMESPACE_END=} ) -if(WITH_CYCLES_NETWORK) - add_definitions(-DWITH_NETWORK) -endif() - if(WITH_CYCLES_STANDALONE_GUI) add_definitions(-DWITH_CYCLES_STANDALONE_GUI) endif() @@ -138,10 +134,6 @@ if(WITH_CYCLES_PTEX) add_definitions(-DWITH_PTEX) endif() -if(WITH_CYCLES_OPENSUBDIV) - add_definitions(-DWITH_OPENSUBDIV) -endif() - if(WITH_CYCLES_OSL) add_definitions(-DWITH_OSL) add_definitions(-DOSL_STATIC_LIBRARY) @@ -151,11 +143,9 @@ if(WITH_CYCLES_OSL) ) endif() -add_definitions( - -DWITH_OPENCL - -DWITH_CUDA - -DWITH_MULTI -) +set(WITH_CYCLES_DEVICE_OPENCL TRUE) +set(WITH_CYCLES_DEVICE_CUDA TRUE) +set(WITH_CYCLES_DEVICE_MULTI TRUE) if(CYCLES_STANDALONE_REPOSITORY) TEST_UNORDERED_MAP_SUPPORT() diff --git a/intern/cycles/blender/CMakeLists.txt b/intern/cycles/blender/CMakeLists.txt index c6a2b919486..a8cc4907cbf 100644 --- a/intern/cycles/blender/CMakeLists.txt +++ b/intern/cycles/blender/CMakeLists.txt @@ -52,6 +52,10 @@ set(ADDON_FILES add_definitions(${GL_DEFINITIONS}) +if(WITH_CYCLES_NETWORK) + add_definitions(-DWITH_NETWORK) +endif() + blender_add_lib(bf_intern_cycles "${SRC}" "${INC}" "${INC_SYS}") # avoid link failure with clang 3.4 debug diff --git a/intern/cycles/device/CMakeLists.txt b/intern/cycles/device/CMakeLists.txt index 220b16bb45b..4d962f5e95f 100644 --- a/intern/cycles/device/CMakeLists.txt +++ b/intern/cycles/device/CMakeLists.txt @@ -46,6 +46,18 @@ set(SRC_HEADERS ) add_definitions(${GL_DEFINITIONS}) +if(WITH_CYCLES_NETWORK) + add_definitions(-DWITH_NETWORK) +endif() +if(WITH_CYCLES_DEVICE_OPENCL) + add_definitions(-DWITH_OPENCL) +endif() +if(WITH_CYCLES_DEVICE_CUDA) + add_definitions(-DWITH_CUDA) +endif() +if(WITH_CYCLES_DEVICE_MULTI) + add_definitions(-DWITH_MULTI) +endif() include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) diff --git a/intern/cycles/subd/CMakeLists.txt b/intern/cycles/subd/CMakeLists.txt index 2641f6d9c0c..1ccf80d9457 100644 --- a/intern/cycles/subd/CMakeLists.txt +++ b/intern/cycles/subd/CMakeLists.txt @@ -25,6 +25,10 @@ set(SRC_HEADERS subd_split.h ) +if(WITH_CYCLES_OPENSUBDIV) + add_definitions(-DWITH_OPENSUBDIV) +endif() + include_directories(${INC}) include_directories(SYSTEM ${INC_SYS}) |