diff options
Diffstat (limited to 'cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake')
| -rw-r--r-- | cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake | 32 |
1 files changed, 11 insertions, 21 deletions
diff --git a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake index 02a12d73302b..142237d5aafd 100644 --- a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake +++ b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake @@ -1,28 +1,23 @@ ---- cmake/modules/FindOpenVDB.cmake.orig 2025-02-14 18:26:40 UTC +--- cmake/modules/FindOpenVDB.cmake.orig 2025-04-10 11:26:51 UTC +++ cmake/modules/FindOpenVDB.cmake -@@ -347,24 +347,24 @@ endmacro() +@@ -347,24 +347,12 @@ endmacro() return() endmacro() -find_package(IlmBase QUIET) -if(NOT IlmBase_FOUND) - pkg_check_modules(IlmBase QUIET IlmBase) -+find_package(Imath QUIET COMPONENTS Half) ++find_package(Imath QUIET COMPONENTS Imath) +if(NOT Imath_FOUND) + pkg_check_modules(Imath QUIET Imath) endif() -if (IlmBase_FOUND AND NOT TARGET IlmBase::Half) - message(STATUS "Falling back to IlmBase found by pkg-config...") -+if (Imath_FOUND AND NOT TARGET Imath::Half) -+ message(STATUS "Falling back to Imath found by pkg-config...") - +- - find_library(IlmHalf_LIBRARY NAMES Half) - if(IlmHalf_LIBRARY-NOTFOUND OR NOT IlmBase_INCLUDE_DIRS) - just_fail("IlmBase::Half can not be found!") -+ find_library(Imath_LIBRARY NAMES Imath) -+ if(Imath_LIBRARY-NOTFOUND OR NOT Imath_INCLUDE_DIRS) -+ just_fail("Imath::Half can not be found!") - endif() +- endif() - - add_library(IlmBase::Half UNKNOWN IMPORTED) - set_target_properties(IlmBase::Half PROPERTIES @@ -30,17 +25,12 @@ - INTERFACE_INCLUDE_DIRECTORIES "${IlmBase_INCLUDE_DIRS}") -elseif(NOT IlmBase_FOUND) - just_fail("IlmBase::Half can not be found!") -+ -+ add_library(Imath::Half UNKNOWN IMPORTED) -+ set_target_properties(Imath::Half PROPERTIES -+ IMPORTED_LOCATION "${Imath_LIBRARY}" -+ INTERFACE_INCLUDE_DIRECTORIES "${Imath_INCLUDE_DIRS}") -+elseif(NOT Imath_FOUND) ++if(NOT Imath_FOUND) + just_fail("Imath::Half can not be found!") endif() find_package(TBB ${_quiet} ${_required} COMPONENTS tbb) find_package(ZLIB ${_quiet} ${_required}) -@@ -451,7 +451,7 @@ if(OpenVDB_USES_ILM) +@@ -451,7 +439,7 @@ if(OpenVDB_USES_ILM) endif() if(OpenVDB_USES_ILM) @@ -49,7 +39,7 @@ endif() if(OpenVDB_USES_EXR) -@@ -463,7 +463,7 @@ endif() +@@ -463,7 +451,7 @@ endif() endif() # Set deps. Note that the order here is important. If we're building against @@ -58,16 +48,16 @@ # users chosen namespaced headers are correctly prioritized. Otherwise other # include paths from shared installs (including houdini) may pull in the wrong # headers -@@ -471,7 +471,7 @@ set(_OPENVDB_VISIBLE_DEPENDENCIES +@@ -471,7 +459,7 @@ set(_OPENVDB_VISIBLE_DEPENDENCIES set(_OPENVDB_VISIBLE_DEPENDENCIES Boost::iostreams Boost::system - IlmBase::Half -+ Imath::Half ++ Imath::Imath ) set(_OPENVDB_DEFINITIONS) -@@ -481,10 +481,10 @@ if(OpenVDB_USES_EXR) +@@ -481,10 +469,10 @@ if(OpenVDB_USES_EXR) if(OpenVDB_USES_EXR) list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES |