[Bf-blender-cvs] [21d4c043873] cycles-x: CMake: Remove unused WITH_CYCLES_DEBUG option

Sergey Sharybin noreply at git.blender.org
Thu May 27 16:35:18 CEST 2021


Commit: 21d4c0438737ffdc32993e63750f118113df3d24
Author: Sergey Sharybin
Date:   Thu May 27 15:40:37 2021 +0200
Branches: cycles-x
https://developer.blender.org/rB21d4c0438737ffdc32993e63750f118113df3d24

CMake: Remove unused WITH_CYCLES_DEBUG option

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

M	CMakeLists.txt
M	build_files/cmake/config/blender_developer.cmake
M	intern/cycles/CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5e7460e59c2..e26cc8408ed 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -404,13 +404,11 @@ set(CYCLES_CUDA_BINARIES_ARCH sm_30 sm_35 sm_37 sm_50 sm_52 sm_60 sm_61 sm_70 sm
 mark_as_advanced(CYCLES_CUDA_BINARIES_ARCH)
 unset(PLATFORM_DEFAULT)
 option(WITH_CYCLES_LOGGING  "Build Cycles with logging support" ON)
-option(WITH_CYCLES_DEBUG    "Build Cycles with extra debug capabilities" OFF)
 option(WITH_CYCLES_NATIVE_ONLY  "Build Cycles with native kernel only (which fits current CPU, use for development only)" OFF)
 option(WITH_CYCLES_KERNEL_ASAN  "Build Cycles kernels with address sanitizer when WITH_COMPILER_ASAN is on, even if it's very slow" OFF)
 mark_as_advanced(WITH_CYCLES_KERNEL_ASAN)
 mark_as_advanced(WITH_CYCLES_CUBIN_COMPILER)
 mark_as_advanced(WITH_CYCLES_LOGGING)
-mark_as_advanced(WITH_CYCLES_DEBUG)
 mark_as_advanced(WITH_CYCLES_NATIVE_ONLY)
 
 option(WITH_CYCLES_DEVICE_CUDA              "Enable Cycles CUDA compute support" ON)
diff --git a/build_files/cmake/config/blender_developer.cmake b/build_files/cmake/config/blender_developer.cmake
index 94f87a2d362..7be9516d9dc 100644
--- a/build_files/cmake/config/blender_developer.cmake
+++ b/build_files/cmake/config/blender_developer.cmake
@@ -7,7 +7,6 @@
 set(WITH_ASSERT_ABORT                 ON  CACHE BOOL "" FORCE)
 set(WITH_BUILDINFO                    OFF CACHE BOOL "" FORCE)
 set(WITH_COMPILER_ASAN                ON  CACHE BOOL "" FORCE)
-set(WITH_CYCLES_DEBUG                 ON  CACHE BOOL "" FORCE)
 set(WITH_CYCLES_NATIVE_ONLY           ON  CACHE BOOL "" FORCE)
 set(WITH_DOC_MANPAGE                  OFF CACHE BOOL "" FORCE)
 set(WITH_GTESTS                       ON  CACHE BOOL "" FORCE)
diff --git a/intern/cycles/CMakeLists.txt b/intern/cycles/CMakeLists.txt
index e43136c26e9..c3acbbe73ff 100644
--- a/intern/cycles/CMakeLists.txt
+++ b/intern/cycles/CMakeLists.txt
@@ -317,11 +317,6 @@ if(WITH_CYCLES_LOGGING)
   )
 endif()
 
-# Debugging capabilities (debug passes etc).
-if(WITH_CYCLES_DEBUG)
-  add_definitions(-DWITH_CYCLES_DEBUG)
-endif()
-
 if(NOT OPENIMAGEIO_PUGIXML_FOUND)
   add_definitions(-DWITH_SYSTEM_PUGIXML)
 endif()



More information about the Bf-blender-cvs mailing list