summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-01 13:45:48 +0800
committerGitHub <[email protected]>2024-07-01 13:45:48 +0800
commit9d34f4062150698f4beadd556da358ff795dc5c9 (patch)
tree9ce83e72a6c0266d6593b33ead55586c2fbcd872
parent6bed5edd427bf382cf966f8cbff780f7fdfdad2d (diff)
parenta737ed8316db110f982fd066a8f43ec861bf5b1e (diff)
Merge pull request #5282 from yamader/dev
add support for missing C++ Modules file extensions
-rw-r--r--xmake/languages/c++/xmake.lua2
-rw-r--r--xmake/rules/c++/modules/xmake.lua2
2 files changed, 2 insertions, 2 deletions
diff --git a/xmake/languages/c++/xmake.lua b/xmake/languages/c++/xmake.lua
index 487746303..5896dde1c 100644
--- a/xmake/languages/c++/xmake.lua
+++ b/xmake/languages/c++/xmake.lua
@@ -20,7 +20,7 @@
language("c++")
add_rules("c++")
- set_sourcekinds {cxx = {".cpp", ".cc", ".cxx", ".mpp", ".mxx", ".cppm", ".ixx", ".c++"}}
+ set_sourcekinds {cxx = {".cpp", ".cc", ".cxx", ".c++", ".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx"}}
set_sourceflags {cxx = {"cxxflags", "cxflags"}}
set_targetkinds {binary = "ld", static = "ar", shared = "sh"}
set_targetflags {binary = "ldflags", static = "arflags", shared = "shflags"}
diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua
index 922841cd1..90ba66c81 100644
--- a/xmake/rules/c++/modules/xmake.lua
+++ b/xmake/rules/c++/modules/xmake.lua
@@ -22,7 +22,7 @@
rule("c++.build.modules")
-- @note common.contains_modules() need it
- set_extensions(".mpp", ".mxx", ".cppm", ".ixx")
+ set_extensions(".cppm", ".ccm", ".cxxm", ".c++m", ".mpp", ".mxx", ".ixx")
add_deps("c++.build.modules.builder")
add_deps("c++.build.modules.install")