Selaa lähdekoodia

openvdb: fix windows build (#4199)

* openvdb: fix windows build

* fix linux

* add patch

* Update xmake.lua
star9029 1 vuosi sitten
vanhempi
commit
a30a517832
2 muutettua tiedostoa jossa 43 lisäystä ja 1 poistoa
  1. 31 0
      packages/o/openvdb/patches/10.1.0/blosc-dep.patch
  2. 12 1
      packages/o/openvdb/xmake.lua

+ 31 - 0
packages/o/openvdb/patches/10.1.0/blosc-dep.patch

@@ -0,0 +1,31 @@
+diff --git a/cmake/FindBlosc.cmake b/cmake/FindBlosc.cmake
+index 5ccf524..65f68c9 100644
+--- a/cmake/FindBlosc.cmake
++++ b/cmake/FindBlosc.cmake
+@@ -191,12 +191,12 @@ list(APPEND _BLOSC_LIBRARYDIR_SEARCH_DIRS
+ # Library suffix handling
+ 
+ set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES ${CMAKE_FIND_LIBRARY_SUFFIXES})
+-set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
++# set(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES ${CMAKE_FIND_LIBRARY_PREFIXES})
+ 
+ if(MSVC)
+   if(BLOSC_USE_STATIC_LIBS)
+     set(CMAKE_FIND_LIBRARY_SUFFIXES ".lib")
+-    set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
++    # set(CMAKE_FIND_LIBRARY_PREFIXES "${CMAKE_FIND_LIBRARY_PREFIXES};lib")
+   endif()
+ else()
+   if(BLOSC_USE_STATIC_LIBS)
+@@ -249,9 +249,9 @@ endforeach()
+ # Reset library suffix
+ 
+ set(CMAKE_FIND_LIBRARY_SUFFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES})
+-set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES})
++# set(CMAKE_FIND_LIBRARY_PREFIXES ${_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES})
+ unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_SUFFIXES)
+-unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
++# unset(_BLOSC_ORIG_CMAKE_FIND_LIBRARY_PREFIXES)
+ 
+ if(Blosc_LIBRARY_DEBUG AND Blosc_LIBRARY_RELEASE)
+   # if the generator is multi-config or if CMAKE_BUILD_TYPE is set for

+ 12 - 1
packages/o/openvdb/xmake.lua

@@ -16,6 +16,8 @@ package("openvdb")
     add_versions("v10.1.0", "2746236e29659a0d35ab90d832f7c7987dd2537587a1a2f9237d9c98afcd5817")
     add_versions("v11.0.0", "6314ff1db057ea90050763e7b7d7ed86d8224fcd42a82cdbb9c515e001b96c74")
 
+    add_patches(">=10.1.0", "patches/10.1.0/blosc-dep.patch", "a1a5adf4ae2c75c3a3a390b25654dd7785b88d15e459a1620fc0b42b20f81ba0")
+
     add_deps("cmake")
     add_deps("boost >1.73", {configs = {regex = true, system = true, iostreams = true}})
 
@@ -67,7 +69,15 @@ package("openvdb")
         io.replace("cmake/FindBlosc.cmake", "${BUILD_TYPE} ${_BLOSC_LIB_NAME}", "${BUILD_TYPE} blosc libblosc", {plain = true})
         io.replace("cmake/FindBlosc.cmake", "lz4 snappy zlib zstd", "lz4", {plain = true})
         io.replace("cmake/FindTBB.cmake", "Tbb_${COMPONENT}_LIB_TYPE STREQUAL STATIC", "TRUE", {plain = true})
-        local configs = {"-DOPENVDB_BUILD_DOCS=OFF", "-DUSE_PKGCONFIG=OFF", "-DBoost_USE_STATIC_LIBS=ON", "-DUSE_CCACHE=OFF", "-DBLOSC_USE_EXTERNAL_SOURCES=ON"}
+
+        local configs = {
+            "-DOPENVDB_BUILD_DOCS=OFF",
+            "-DUSE_PKGCONFIG=OFF",
+            "-DBoost_USE_STATIC_LIBS=ON",
+            "-DUSE_CCACHE=OFF",
+            "-DBLOSC_USE_EXTERNAL_SOURCES=ON"
+        }
+
         if package:config("shared") then
             table.insert(configs, "-DOPENVDB_CORE_SHARED=ON")
             table.insert(configs, "-DOPENVDB_CORE_STATIC=OFF")
@@ -84,6 +94,7 @@ package("openvdb")
         end
         table.insert(configs, "-DOPENVDB_BUILD_VDB_LOD=" .. (package:config("lod") and "ON" or "OFF"))
         table.insert(configs, "-DOPENVDB_BUILD_VDB_PRINT=" .. (package:config("print") and "ON" or "OFF"))
+        table.insert(configs, "-DOPENVDB_BUILD_BINARIES=" .. (package:config("print") and "ON" or "OFF"))
         table.insert(configs, "-DOPENVDB_BUILD_VDB_RENDER=" .. (package:config("render") and "ON" or "OFF"))
         table.insert(configs, "-DOPENVDB_BUILD_VDB_VIEW=" .. (package:config("view") and "ON" or "OFF"))
         if package:version():ge("10.0") then