From 32e2ff3e7cbfe6783a94e85cc43dc5674ecc7435 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 13 Sep 2024 23:26:34 +0800 Subject: [PATCH 1/3] add ninja dep to cmake --- packages/c/cmake/xmake.lua | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/packages/c/cmake/xmake.lua b/packages/c/cmake/xmake.lua index 211a9ac8132..3d5dd50f7f7 100644 --- a/packages/c/cmake/xmake.lua +++ b/packages/c/cmake/xmake.lua @@ -136,6 +136,14 @@ package("cmake") add_extsources("brew::cmake") end + on_load(function (package) + -- xmake v3.x will enable this ninja policy by default + import("core.project.project") + if project.policy("package.cmake_generator.ninja") then + package:add("deps", "ninja") + end + end) + on_install("@macosx", function (package) os.cp("CMake.app/Contents/bin", package:installdir()) os.cp("CMake.app/Contents/share", package:installdir()) From 721ce2f44ee511363bbffaa3ea728a0380a74c5a Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 13 Sep 2024 18:02:09 +0800 Subject: [PATCH 2/3] Update xmake.lua --- packages/c/cmake/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/c/cmake/xmake.lua b/packages/c/cmake/xmake.lua index 3d5dd50f7f7..ae89daec4a1 100644 --- a/packages/c/cmake/xmake.lua +++ b/packages/c/cmake/xmake.lua @@ -139,7 +139,7 @@ package("cmake") on_load(function (package) -- xmake v3.x will enable this ninja policy by default import("core.project.project") - if project.policy("package.cmake_generator.ninja") then + if xmake:version():ge("2.9.0") and project.policy("package.cmake_generator.ninja") then package:add("deps", "ninja") end end) From f66af3c7506c8828b967d54c9887a544190dc960 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 13 Sep 2024 18:02:32 +0800 Subject: [PATCH 3/3] Update xmake.lua --- packages/c/cmake/xmake.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/c/cmake/xmake.lua b/packages/c/cmake/xmake.lua index ae89daec4a1..eb6ab2523fa 100644 --- a/packages/c/cmake/xmake.lua +++ b/packages/c/cmake/xmake.lua @@ -139,7 +139,7 @@ package("cmake") on_load(function (package) -- xmake v3.x will enable this ninja policy by default import("core.project.project") - if xmake:version():ge("2.9.0") and project.policy("package.cmake_generator.ninja") then + if xmake.version():ge("2.9.0") and project.policy("package.cmake_generator.ninja") then package:add("deps", "ninja") end end)