From 5af103fe008aac0cb20631871bbee16f319835ed Mon Sep 17 00:00:00 2001 From: Sergey Sharybin Date: Tue, 12 Jan 2016 20:50:43 +0500 Subject: 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 --- intern/cycles/CMakeLists.txt | 16 +++------------- 1 file changed, 3 insertions(+), 13 deletions(-) (limited to 'intern/cycles/CMakeLists.txt') 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() -- cgit v1.2.3