Răsfoiți Sursa

Assimp: Fix MinGW and update to 5.1.4 (#803)

* Assimp: Fix MinGW and update to 5.1.4

* Update xmake.lua
Jérôme Leclercq 3 ani în urmă
părinte
comite
5afa4f3aba
1 a modificat fișierele cu 8 adăugiri și 0 ștergeri
  1. 8 0
      packages/a/assimp/xmake.lua

+ 8 - 0
packages/a/assimp/xmake.lua

@@ -5,6 +5,7 @@ package("assimp")
 
     set_urls("https://github.com/assimp/assimp/archive/$(version).zip",
              "https://github.com/assimp/assimp.git")
+    add_versions("v5.1.4", "59a00cf72fa5ceff960460677e2b37be5cd1041e85bae9c02828c27ade7e4160")
     add_versions("v5.0.1", "d10542c95e3e05dece4d97bb273eba2dfeeedb37a78fb3417fd4d5e94d879192")
     add_patches("v5.0.1", path.join(os.scriptdir(), "patches", "5.0.1", "fix-mingw.patch"), "a3375489e2bbb2dd97f59be7dd84e005e7e9c628b4395d7022a6187ca66b5abb")
 
@@ -62,6 +63,8 @@ package("assimp")
             if not zlib:is_system() then
                 local fetchinfo = zlib:fetch()
                 io.replace("CMakeLists.txt", "FIND_PACKAGE(ZLIB)", "", {plain = true})
+                io.replace("CMakeLists.txt", [[INSTALL( TARGETS zlib zlibstatic
+        EXPORT "${TARGETS_EXPORT_NAME}")]], "", {plain = true})
                 table.insert(configs, "-DZLIB_FOUND=TRUE")
                 table.insert(configs, "-DZLIB_INCLUDE_DIR=" .. table.concat(fetchinfo.includedirs or fetchinfo.sysincludedirs, ";"))
                 table.insert(configs, "-DZLIB_LIBRARIES=" .. table.concat(fetchinfo.libfiles, ";"))
@@ -92,6 +95,11 @@ package("assimp")
             table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF")
         end
 
+        if package:is_plat("mingw") then
+            -- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311
+            io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true})
+        end
+
         import("package.tools.cmake").install(package, configs)
     end)