[Bf-blender-cvs] [d09c5bdc28a] master: CMake: make OpenVDB depend on OpenEXR

Campbell Barton noreply at git.blender.org
Wed Mar 4 01:09:39 CET 2020


Commit: d09c5bdc28a17e3c1cdfdd9805c50508894878dc
Author: Campbell Barton
Date:   Wed Mar 4 10:39:53 2020 +1100
Branches: master
https://developer.blender.org/rBd09c5bdc28a17e3c1cdfdd9805c50508894878dc

CMake: make OpenVDB depend on OpenEXR

OpenVDB uses 'half' type & fails to link without it.

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

M	CMakeLists.txt

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 0116446454e..2b4721ff98f 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -633,6 +633,9 @@ set_and_warn_dependency(WITH_TBB WITH_OPENIMAGEDENOISE  OFF)
 set_and_warn_dependency(WITH_TBB WITH_OPENVDB           OFF)
 set_and_warn_dependency(WITH_TBB WITH_MOD_FLUID         OFF)
 
+# OpenVDB uses 'half' type from OpenEXR & fails to link without OpenEXR enabled.
+set_and_warn_dependency(WITH_IMAGE_OPENEXR WITH_OPENVDB OFF)
+
 # auto enable openimageio for cycles
 if(WITH_CYCLES)
   set(WITH_OPENIMAGEIO ON)



More information about the Bf-blender-cvs mailing list