From 735273f5379abd99ee1b9a66818ffdf5662895d6 Mon Sep 17 00:00:00 2001 From: Campbell Barton Date: Thu, 10 Aug 2023 12:36:31 +1000 Subject: [PATCH] CMake: show WITH_HYDRA on first installation Also disable OSL for lite builds, only makes a difference when cycles is enabled for lite builds. --- CMakeLists.txt | 19 ++++++++++++------- build_files/cmake/config/blender_lite.cmake | 1 + 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f375eabd79a..ea0bf74876d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -2280,20 +2280,25 @@ if(FIRST_RUN) info_cfg_option(WITH_LZMA) info_cfg_option(WITH_LZO) - info_cfg_text("Python:") - info_cfg_option(WITH_PYTHON_INSTALL) - info_cfg_option(WITH_PYTHON_INSTALL_NUMPY) - info_cfg_option(WITH_PYTHON_INSTALL_ZSTANDARD) - info_cfg_option(WITH_PYTHON_MODULE) - info_cfg_option(WITH_PYTHON_SAFETY) + if(WITH_PYTHON) + info_cfg_text("Python:") + info_cfg_option(WITH_PYTHON_INSTALL) + info_cfg_option(WITH_PYTHON_INSTALL_NUMPY) + info_cfg_option(WITH_PYTHON_INSTALL_ZSTANDARD) + info_cfg_option(WITH_PYTHON_MODULE) + info_cfg_option(WITH_PYTHON_SAFETY) + endif() info_cfg_text("Modifiers:") info_cfg_option(WITH_MOD_FLUID) info_cfg_option(WITH_MOD_OCEANSIM) info_cfg_option(WITH_MOD_REMESH) + info_cfg_text("Rendering:") + info_cfg_option(WITH_HYDRA) + if(WITH_CYCLES) - info_cfg_text("Cycles:") + info_cfg_text("Rendering (Cycles):") info_cfg_option(WITH_CYCLES_OSL) info_cfg_option(WITH_CYCLES_EMBREE) info_cfg_option(WITH_CYCLES_PATH_GUIDING) diff --git a/build_files/cmake/config/blender_lite.cmake b/build_files/cmake/config/blender_lite.cmake index 873b1dc5493..80b947e0128 100644 --- a/build_files/cmake/config/blender_lite.cmake +++ b/build_files/cmake/config/blender_lite.cmake @@ -78,5 +78,6 @@ endif() # appear to be enabled in the list of items (which are mostly OFF). set(WITH_CYCLES_DEVICE_OPTIX OFF CACHE BOOL "" FORCE) set(WITH_CYCLES_EMBREE OFF CACHE BOOL "" FORCE) +set(WITH_CYCLES_OSL OFF CACHE BOOL "" FORCE) set(WITH_CYCLES_PATH_GUIDING OFF CACHE BOOL "" FORCE) set(WITH_OPENVDB_BLOSC OFF CACHE BOOL "" FORCE)