diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2020-10-03 14:52:41 +0300 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2020-10-03 14:55:25 +0300 |
| commit | 0bf12cb025a3fd143318b4a38db46b3c114cdf3f (patch) | |
| tree | b9a5870e4d8d2966b2de90b97cc45d668c175ccb | |
| parent | 44397a683c1c44ab78be56fa21625dd08b86a037 (diff) | |
Fix error in recent change "run UserDef versioning from readfile.c"
Missed moving the defines in CMake for e255040c7797
causing cycles not to be enabled.
| -rw-r--r-- | source/blender/editors/interface/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | source/blender/windowmanager/CMakeLists.txt | 3 |
2 files changed, 3 insertions, 4 deletions
diff --git a/source/blender/editors/interface/CMakeLists.txt b/source/blender/editors/interface/CMakeLists.txt index e7b4402d1f1..82bcd5d7eb4 100644 --- a/source/blender/editors/interface/CMakeLists.txt +++ b/source/blender/editors/interface/CMakeLists.txt @@ -96,10 +96,6 @@ if(WITH_HEADLESS) add_definitions(-DWITH_HEADLESS) endif() -if(WITH_CYCLES) - add_definitions(-DWITH_CYCLES) -endif() - if(WITH_PYTHON) add_definitions(-DWITH_PYTHON) endif() diff --git a/source/blender/windowmanager/CMakeLists.txt b/source/blender/windowmanager/CMakeLists.txt index b9efc0e386a..78ea6651f2f 100644 --- a/source/blender/windowmanager/CMakeLists.txt +++ b/source/blender/windowmanager/CMakeLists.txt @@ -130,6 +130,9 @@ if(WITH_AUDASPACE) ) endif() +if(WITH_CYCLES) + add_definitions(-DWITH_CYCLES) +endif() if(WITH_INTERNATIONAL) add_definitions(-DWITH_INTERNATIONAL) |