star9029 1 år sedan
förälder
incheckning
1148ceb138
1 ändrade filer med 14 tillägg och 2 borttagningar
  1. 14 2
      packages/o/openvdb/xmake.lua

+ 14 - 2
packages/o/openvdb/xmake.lua

@@ -65,9 +65,21 @@ package("openvdb")
 
 
     on_install("macosx", "linux", "windows|x64", "windows|x86", function (package)
     on_install("macosx", "linux", "windows|x64", "windows|x86", function (package)
         io.replace("cmake/FindBlosc.cmake", "${BUILD_TYPE} ${_BLOSC_LIB_NAME}", "${BUILD_TYPE} blosc libblosc", {plain = true})
         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", "", {plain = true})
         io.replace("cmake/FindTBB.cmake", "Tbb_${COMPONENT}_LIB_TYPE STREQUAL STATIC", "TRUE", {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"}
+        if package:is_plat("windows") then
+            io.replace("cmake/FindBlosc.cmake", "lz4 snappy zlib zstd", "", {plain = true})
+        else
+            io.replace("cmake/FindBlosc.cmake", "lz4 snappy zlib zstd", "lz4", {plain = true})
+        end
+
+        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
         if package:config("shared") then
             table.insert(configs, "-DOPENVDB_CORE_SHARED=ON")
             table.insert(configs, "-DOPENVDB_CORE_SHARED=ON")
             table.insert(configs, "-DOPENVDB_CORE_STATIC=OFF")
             table.insert(configs, "-DOPENVDB_CORE_STATIC=OFF")