From 4046e3fc51721a60361e1e3b9de852e9909f3f6f Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 26 Dec 2023 23:13:40 +0800 Subject: [PATCH 1/2] fix assimp for old version --- packages/a/assimp/xmake.lua | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/a/assimp/xmake.lua b/packages/a/assimp/xmake.lua index 3a3db9e58dc..adebcd799d6 100644 --- a/packages/a/assimp/xmake.lua +++ b/packages/a/assimp/xmake.lua @@ -99,12 +99,12 @@ package("assimp") table.insert(configs, "-DASSIMP_BUILD_ASSIMP_TOOLS=OFF") end - if not package:gitref() and package:version():lt("v5.2.4") then - -- ASSIMP_WARNINGS_AS_ERRORS is not supported before v5.2.4 + -- ASSIMP_WARNINGS_AS_ERRORS maybe does not work for some old versions + for _, cmakefile in ipairs(table.join("CMakeLists.txt", os.files("**/CMakeLists.txt"))) do if package:is_plat("windows") then - io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE /W4 /WX)", "", {plain = true}) + io.replace(cmakefile, "/W4 /WX", "", {plain = true}) else - io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE -Werror)", "", {plain = true}) + io.replace(cmakefile, "-Werror", "", {plain = true}) end end if not package:gitref() and package:version():eq("v5.2.5") then From 1103457147adb11354e12c5ccb1d07aa840300ba Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 26 Dec 2023 13:53:29 +0800 Subject: [PATCH 2/2] Update xmake.lua --- packages/a/assimp/xmake.lua | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/packages/a/assimp/xmake.lua b/packages/a/assimp/xmake.lua index adebcd799d6..314ab44a3f6 100644 --- a/packages/a/assimp/xmake.lua +++ b/packages/a/assimp/xmake.lua @@ -107,10 +107,9 @@ package("assimp") io.replace(cmakefile, "-Werror", "", {plain = true}) end end - if not package:gitref() and package:version():eq("v5.2.5") then - -- Remove /WX from CMakeLists for MSVC: https://github.com/assimp/assimp/pull/5183 - io.replace("CMakeLists.txt", "ADD_COMPILE_OPTIONS(/bigobj /W4 /WX )", "ADD_COMPILE_OPTIONS(/bigobj)", {plain = true}) - io.replace("CMakeLists.txt", "ADD_COMPILE_OPTIONS(/MP /bigobj /W4 /WX)", "ADD_COMPILE_OPTIONS(/MP /bigobj)", {plain = true}) + -- fix cmake_install failed + if not package:gitref() and package:version():ge("v5.3.0") and package:is_plat("windows") and package:is_debug() then + io.replace("code/CMakeLists.txt", "IF(GENERATOR_IS_MULTI_CONFIG)", "IF(TRUE)", {plain = true}) end if package:is_plat("mingw") and package:version():lt("v5.1.5") then -- CMAKE_COMPILER_IS_MINGW has been removed: https://github.com/assimp/assimp/pull/4311