summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/modules_support
diff options
context:
space:
mode:
authorArthur LAURENT <[email protected]>2024-02-06 18:31:13 +0100
committerArthur LAURENT <[email protected]>2024-02-06 18:32:06 +0100
commit8929c381e0cd70ff804e7c52bb3efc134e056e78 (patch)
tree57505d519dbb53c9ea45a8836cbcc63140bf0f28 /xmake/rules/c++/modules/modules_support
parent3266f5dda184c4d1b1d340ec9e21cc9f299fcb84 (diff)
implement target kind moduleonly
Diffstat (limited to 'xmake/rules/c++/modules/modules_support')
-rw-r--r--xmake/rules/c++/modules/modules_support/compiler_support.lua4
-rw-r--r--xmake/rules/c++/modules/modules_support/dependency_scanner.lua2
2 files changed, 3 insertions, 3 deletions
diff --git a/xmake/rules/c++/modules/modules_support/compiler_support.lua b/xmake/rules/c++/modules/modules_support/compiler_support.lua
index d7e8a0bd8..d9d849454 100644
--- a/xmake/rules/c++/modules/modules_support/compiler_support.lua
+++ b/xmake/rules/c++/modules/modules_support/compiler_support.lua
@@ -116,14 +116,14 @@ end
-- this target contains module files?
function contains_modules(target)
-- we can not use `"c++.build.builder"`, because it contains sourcekind/cxx.
- local target_with_modules = (target:sourcebatches()["c++.moduleonly"] or target:sourcebatches()["c++.build.modules"]) and true or false
+ local target_with_modules = target:sourcebatches()["c++.build.modules"] and true or false
if not target_with_modules then
target_with_modules = target:policy("build.c++.modules")
end
if not target_with_modules then
for _, dep in ipairs(target:orderdeps()) do
local sourcebatches = dep:sourcebatches()
- if sourcebatches["c++.moduleonly"] or sourcebatches["c++.build.modules"] then
+ if sourcebatches["c++.build.modules"] then
target_with_modules = true
break
end
diff --git a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
index e4e6783bd..0b02292ef 100644
--- a/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
+++ b/xmake/rules/c++/modules/modules_support/dependency_scanner.lua
@@ -438,7 +438,7 @@ end
function get_targetdeps_modules(target)
local sourcefiles
for _, dep in ipairs(target:orderdeps()) do
- local sourcebatch = dep:sourcebatches()["c++.moduleonly"] or dep:sourcebatches()["c++.build.modules.builder"]
+ local sourcebatch = dep:sourcebatches()["c++.build.modules.builder"]
if sourcebatch and sourcebatch.sourcefiles then
for _, sourcefile in ipairs(sourcebatch.sourcefiles) do
local fileconfig = dep:fileconfig(sourcefile)