[Bf-blender-cvs] [0bf12cb025a] master: Fix error in recent change "run UserDef versioning from readfile.c"

Campbell Barton noreply at git.blender.org
Sat Oct 3 13:55:56 CEST 2020


Commit: 0bf12cb025a3fd143318b4a38db46b3c114cdf3f
Author: Campbell Barton
Date:   Sat Oct 3 21:52:41 2020 +1000
Branches: master
https://developer.blender.org/rB0bf12cb025a3fd143318b4a38db46b3c114cdf3f

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.

===================================================================

M	source/blender/editors/interface/CMakeLists.txt
M	source/blender/windowmanager/CMakeLists.txt

===================================================================

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)



More information about the Bf-blender-cvs mailing list