summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xmake/rules/c++/modules/modules_support/common.lua5
-rw-r--r--xmake/rules/c++/modules/xmake.lua2
2 files changed, 2 insertions, 5 deletions
diff --git a/xmake/rules/c++/modules/modules_support/common.lua b/xmake/rules/c++/modules/modules_support/common.lua
index 39ad17f2e..0bd1e20d8 100644
--- a/xmake/rules/c++/modules/modules_support/common.lua
+++ b/xmake/rules/c++/modules/modules_support/common.lua
@@ -88,7 +88,6 @@ end
-- patch sourcebatch
function patch_sourcebatch(target, sourcebatch)
- local cachedir = modules_cachedir(target)
sourcebatch.sourcekind = "cxx"
sourcebatch.objectfiles = {}
sourcebatch.dependfiles = {}
@@ -138,11 +137,11 @@ end
-- this target contains module files?
function contains_modules(target)
- local target_with_modules = target:sourcebatches()["c++.build.modules"] and true or false
+ local target_with_modules = target:sourcebatches()["c++.build.modules.builder"] and true or false
if not target_with_modules then
for _, dep in ipairs(target:orderdeps()) do
local sourcebatches = dep:sourcebatches()
- if sourcebatches["c++.build.modules"] then
+ if sourcebatches["c++.build.modules.builder"] then
target_with_modules = true
break
end
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index 276566a27..ae81ebc25 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -20,8 +20,6 @@
-- define rule: c++.build.modules
rule("c++.build.modules")
- set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
-
add_deps("c++.build.modules.builder")
add_deps("c++.build.modules.install")