[Bf-blender-cvs] [1bb7fda600c] master: CMake: Fix noisy PUGIXML warning.
Ray Molenkamp
noreply at git.blender.org
Wed May 11 00:38:26 CEST 2022
Commit: 1bb7fda600c0ef09f49da1354e06442fb62266ce
Author: Ray Molenkamp
Date: Tue May 10 16:38:20 2022 -0600
Branches: master
https://developer.blender.org/rB1bb7fda600c0ef09f49da1354e06442fb62266ce
CMake: Fix noisy PUGIXML warning.
When doing a lite build, a warning is displayed
that due to PUGIXML being off WITH_CYCLES_OSL
is being disabled as well.
If WITH_CYCLES is off this is just useless
noise.
this diff changes the warning to only emit when
WITH_CYCLES is on.
===================================================================
M CMakeLists.txt
===================================================================
diff --git a/CMakeLists.txt b/CMakeLists.txt
index f48334a298b..3e038fe3edd 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -781,7 +781,9 @@ set_and_warn_dependency(WITH_BOOST WITH_OPENCOLORIO OFF)
set_and_warn_dependency(WITH_BOOST WITH_QUADRIFLOW OFF)
set_and_warn_dependency(WITH_BOOST WITH_USD OFF)
set_and_warn_dependency(WITH_BOOST WITH_ALEMBIC OFF)
-set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF)
+if(WITH_CYCLES)
+ set_and_warn_dependency(WITH_PUGIXML WITH_CYCLES_OSL OFF)
+endif()
set_and_warn_dependency(WITH_PUGIXML WITH_OPENIMAGEIO OFF)
if(WITH_BOOST AND NOT (WITH_CYCLES OR WITH_OPENIMAGEIO OR WITH_INTERNATIONAL OR
More information about the Bf-blender-cvs
mailing list