From 6fbaf9e18172afdf58267e2b9b9a4b9aabc3cef5 Mon Sep 17 00:00:00 2001 From: Frank Zhuang Date: Wed, 23 Aug 2023 19:13:11 +0800 Subject: [PATCH] fix assimp: Remove /WX from CMakeLists for MSVC (#2487) --- packages/a/assimp/xmake.lua | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages/a/assimp/xmake.lua b/packages/a/assimp/xmake.lua index 913082887..03cd4c69c 100644 --- a/packages/a/assimp/xmake.lua +++ b/packages/a/assimp/xmake.lua @@ -93,6 +93,11 @@ package("assimp") io.replace("code/CMakeLists.txt", "TARGET_COMPILE_OPTIONS(assimp PRIVATE -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}) + 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 io.replace("CMakeLists.txt", "CMAKE_COMPILER_IS_MINGW", "MINGW", {plain = true})