From d6ee79eeddbe08617a41c24c2040aff37626f845 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 14 Apr 2023 22:37:48 +0800 Subject: fix rc file for cmake generator #3626 --- xmake/plugins/project/cmake/cmakelists.lua | 3 ++- xmake/scripts/xrepo/envs/devel.lua | 2 +- 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 -- cgit v1.3.1