Skip to content

Commit 9ee2368

Browse files
committed
improve c++modules exts
1 parent 8048be7 commit 9ee2368

File tree

2 files changed

+4
-13
lines changed

2 files changed

+4
-13
lines changed

xmake/rules/c++/modules/support.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -158,7 +158,7 @@ function has_module_extension(sourcefile, opt)
158158
opt = opt or {}
159159
local modulexts = _g.modulexts
160160
if modulexts == nil then
161-
modulexts = hashset.of(".mpp", ".mxx", ".cppm", ".ixx")
161+
modulexts = hashset.of(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
162162
_g.modulexts = modulexts
163163
end
164164
local extension = opt.extension or path.extension(sourcefile)

xmake/rules/c++/modules/xmake.lua

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020

2121
-- define rule: c++.build.modules
2222
rule("c++.build.modules")
23-
2423
-- @note support.contains_modules() need it
2524
set_extensions(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
2625

@@ -36,37 +35,29 @@ rule("c++.build.modules")
3635
-- scan modules
3736
rule("c++.build.modules.scanner")
3837
set_sourcekinds("cxx")
39-
set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
40-
41-
-- generate module dependencies
38+
set_extensions(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
4239
on_prepare_files("scanner", {jobgraph = true})
43-
44-
-- insert objectfiles
4540
after_prepare_files("scanner.after_scan")
4641

4742
-- build modules
4843
rule("c++.build.modules.builder")
4944
set_sourcekinds("cxx")
50-
set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
51-
45+
set_extensions(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
5246
add_orders("c++.build.modules.scanner", "c++.build.modules.builder")
5347

5448
-- parallel build support to accelerate `xmake build` to build modules
5549
before_build_files("builder.build_bmis", {jobgraph = true, batch = true})
56-
5750
on_build_files("builder.build_objectfiles", {jobgraph = true, batch = true})
5851

5952
-- serial compilation only, usually used to support project generator
6053
before_buildcmd_files("builder.build_bmis")
61-
6254
on_buildcmd_files("builder.build_objectfiles")
6355

6456
after_clean("builder.clean")
6557

6658
-- install modules
6759
rule("c++.build.modules.install")
68-
set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
60+
set_extensions(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
6961

7062
before_install("install.install")
71-
7263
before_uninstall("install.uninstall")

0 commit comments

Comments
 (0)