summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-04-14 22:37:48 +0800
committerruki <[email protected]>2023-04-14 22:37:48 +0800
commitd6ee79eeddbe08617a41c24c2040aff37626f845 (patch)
tree45c1dd9cdbeac175278b0f8fea53175dfea5f12d
parent9385a3b2784284512d7799493a1ebf154edfeeae (diff)
fix rc file for cmake generator #3626
-rw-r--r--xmake/plugins/project/cmake/cmakelists.lua3
-rw-r--r--xmake/scripts/xrepo/envs/devel.lua2
2 files changed, 3 insertions, 2 deletions
diff --git a/xmake/plugins/project/cmake/cmakelists.lua b/xmake/plugins/project/cmake/cmakelists.lua
index b2910f676..07e8a8749 100644
--- a/xmake/plugins/project/cmake/cmakelists.lua
+++ b/xmake/plugins/project/cmake/cmakelists.lua
@@ -137,7 +137,8 @@ function _sourcebatch_is_built(sourcebatch)
local rulename = sourcebatch.rulename
if rulename == "c.build" or rulename == "c++.build"
or rulename == "asm.build" or rulename == "cuda.build"
- or rulename == "objc.build" or rulename == "objc++.build" then
+ or rulename == "objc.build" or rulename == "objc++.build"
+ or rulename == "win.sdk.resource" then
return true
end
end
diff --git a/xmake/scripts/xrepo/envs/devel.lua b/xmake/scripts/xrepo/envs/devel.lua
index 407287058..bdcefa32e 100644
--- a/xmake/scripts/xrepo/envs/devel.lua
+++ b/xmake/scripts/xrepo/envs/devel.lua
@@ -1,4 +1,4 @@
-add_requires("cmake")
+add_requires("cmake", "ninja")
if is_host("windows") and winos.version():le("win7") then
add_requires("python 3.7.x")
else