[Bf-blender-cvs] [8c04bf54bf1] cycles_path_guiding: Cycles-X: Path Guiding: Cleaned up CMake scripts

Sebastian Herholz noreply at git.blender.org
Thu Jul 28 09:33:56 CEST 2022


Commit: 8c04bf54bf1d606578da41e8bf2895fa3d6b2373
Author: Sebastian Herholz
Date:   Mon Jul 25 11:55:30 2022 +0200
Branches: cycles_path_guiding
https://developer.blender.org/rB8c04bf54bf1d606578da41e8bf2895fa3d6b2373

Cycles-X: Path Guiding: Cleaned up CMake scripts

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

M	CMakeLists.txt
M	intern/cycles/cmake/external_libs.cmake

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 43758427099..45f1be10353 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -405,6 +405,7 @@ mark_as_advanced(WITH_CPU_SIMD)
 # Cycles
 option(WITH_CYCLES                   "Enable Cycles Render Engine" ON)
 option(WITH_CYCLES_OSL               "Build Cycles with OpenShadingLanguage support" ON)
+option(WITH_CYCLES_PATH_GUIDING      "Build Cycles with path guiding support" ON)
 option(WITH_CYCLES_EMBREE            "Build Cycles with Embree support" ON)
 option(WITH_CYCLES_LOGGING           "Build Cycles with logging support" ON)
 option(WITH_CYCLES_DEBUG             "Build Cycles with options useful for debugging (e.g., MIS)" OFF)
@@ -449,9 +450,6 @@ if(NOT APPLE)
   mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 endif()
 
-# Intel OpenPGL
-option(WITH_CYCLES_PATH_GUIDING              "Build Cycles with path guiding support" ON)
-
 # Apple Metal
 if(APPLE)
   option(WITH_CYCLES_DEVICE_METAL       "Enable Cycles Apple Metal compute support" ON)
diff --git a/intern/cycles/cmake/external_libs.cmake b/intern/cycles/cmake/external_libs.cmake
index e1e06198787..b147bb0b7f8 100644
--- a/intern/cycles/cmake/external_libs.cmake
+++ b/intern/cycles/cmake/external_libs.cmake
@@ -262,6 +262,9 @@ if(CYCLES_STANDALONE_REPOSITORY AND WITH_CYCLES_OSL)
   endif()
 endif()
 
+###########################################################################
+# OpenPGL
+###########################################################################
 
 if(WITH_CYCLES_PATH_GUIDING)
   if(NOT openpgl_DIR)



More information about the Bf-blender-cvs mailing list