summaryrefslogtreecommitdiff
path: root/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
diff options
context:
space:
mode:
authorteodorsigaev@gmail.com <teodorsigaev@gmail.com>2022-11-17 22:57:32 +0100
committerFernando ApesteguĂ­a <fernape@FreeBSD.org>2022-11-18 17:13:31 +0100
commit3d8cf46cdbe30af59931532b4c7c95bd44e801da (patch)
tree771f1597bf65e267d99512666a51b27cb0b4d971 /cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
parentdevel/gdb: make Expat and xxHash support optional (on by default) (diff)
cad/PrusaSlicer: update to 2.5.0
ChangeLog: https://www.freshports.org/cad/PrusaSlicer/ PR: 267772 Reported by: teodorsigaev@gmail.com (maintainer)
Diffstat (limited to 'cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake')
-rw-r--r--cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake21
1 files changed, 11 insertions, 10 deletions
diff --git a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
index 34a84f656874..3a99d042e938 100644
--- a/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
+++ b/cad/PrusaSlicer/files/patch-cmake_modules_FindOpenVDB.cmake
@@ -1,10 +1,10 @@
---- cmake/modules/FindOpenVDB.cmake.orig 2021-01-11 13:01:51 UTC
+--- cmake/modules/FindOpenVDB.cmake.orig 2022-09-06 07:09:19 UTC
+++ cmake/modules/FindOpenVDB.cmake
-@@ -326,24 +326,24 @@ macro(just_fail msg)
+@@ -347,24 +347,24 @@ macro(just_fail msg)
return()
endmacro()
--find_package(IlmBase QUIET COMPONENTS Half)
+-find_package(IlmBase QUIET)
-if(NOT IlmBase_FOUND)
- pkg_check_modules(IlmBase QUIET IlmBase)
+find_package(Imath QUIET COMPONENTS Half)
@@ -23,23 +23,24 @@
+ if(Imath_LIBRARY-NOTFOUND OR NOT Imath_INCLUDE_DIRS)
+ just_fail("Imath::Half can not be found!")
endif()
-
+-
- add_library(IlmBase::Half UNKNOWN IMPORTED)
- set_target_properties(IlmBase::Half PROPERTIES
- IMPORTED_LOCATION "${IlmHalf_LIBRARY}"
- 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}")
++ IMPORTED_LOCATION "${Imath_LIBRARY}"
++ INTERFACE_INCLUDE_DIRECTORIES "${Imath_INCLUDE_DIRS}")
+elseif(NOT Imath_FOUND)
+ just_fail("Imath::Half can not be found!")
endif()
find_package(TBB ${_quiet} ${_required} COMPONENTS tbb)
find_package(ZLIB ${_quiet} ${_required})
-@@ -430,7 +430,7 @@ if(OpenVDB_USES_LOG4CPLUS)
+@@ -451,7 +451,7 @@ if(OpenVDB_USES_LOG4CPLUS)
endif()
if(OpenVDB_USES_ILM)
@@ -48,7 +49,7 @@
endif()
if(OpenVDB_USES_EXR)
-@@ -442,7 +442,7 @@ if(UNIX)
+@@ -463,7 +463,7 @@ if(UNIX)
endif()
# Set deps. Note that the order here is important. If we're building against
@@ -57,7 +58,7 @@
# users chosen namespaced headers are correctly prioritized. Otherwise other
# include paths from shared installs (including houdini) may pull in the wrong
# headers
-@@ -450,7 +450,7 @@ endif()
+@@ -471,7 +471,7 @@ endif()
set(_OPENVDB_VISIBLE_DEPENDENCIES
Boost::iostreams
Boost::system
@@ -66,7 +67,7 @@
)
set(_OPENVDB_DEFINITIONS)
-@@ -460,10 +460,10 @@ endif()
+@@ -481,10 +481,10 @@ endif()
if(OpenVDB_USES_EXR)
list(APPEND _OPENVDB_VISIBLE_DEPENDENCIES