summaryrefslogtreecommitdiff
path: root/xmake/rules/c++/modules/xmake.lua
diff options
context:
space:
mode:
authorruki <[email protected]>2022-08-04 22:37:59 +0800
committerruki <[email protected]>2022-08-04 22:37:59 +0800
commit0e52b4967cd20677c1dcc7656e2016c076ed2647 (patch)
tree67d13c3ee93e036a3429c269b9578a3ddaab625b /xmake/rules/c++/modules/xmake.lua
parentcc8ee163098a464937769641377fd98c33bdfca2 (diff)
improve load modules
Diffstat (limited to 'xmake/rules/c++/modules/xmake.lua')
-rw-r--r--xmake/rules/c++/modules/xmake.lua9
1 files changed, 3 insertions, 6 deletions
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index 7b6697eeb..9a7599358 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -41,14 +41,11 @@ rule("c++.build.modules")
-- get modules support
local modules_support = common.modules_support(target)
- -- check C++20 module support
- modules_support.check_module_support(target)
+ -- load module support
+ modules_support.load(target)
-- mark this target with modules
target:data_set("cxx.has_modules", true)
-
- -- load parent
- modules_support.load_parent(target, opt)
end
end)
@@ -69,7 +66,7 @@ rule("c++.build.modules.dependencies")
modules_support.generate_dependencies(target, sourcebatch, opt)
-- load and parse module dependencies
- local moduleinfos = common.load(target, sourcebatch, opt)
+ local moduleinfos = common.load_moduleinfos(target, sourcebatch, opt)
local modules = common.parse_dependency_data(target, moduleinfos, opt)
target:data_set("cxx.modules", modules)
end)