rename clang std modulemap enabler and disable it by default

7 files changed, 10 insertions, 5 deletions

diff --git a/tests/projects/c++/modules/class/xmake.lua b/tests/projects/c++/modules/class/xmake.lua
index 2dfca344c..42da78369 100644
--- a/tests/projects/c++/modules/class/xmake.lua
+++ b/tests/projects/c++/modules/class/xmake.lua
@@ -5,4 +5,4 @@ target("class")
     set_kind("binary")
     add_files("src/*.cpp", "src/*.mpp")
 
-    set_values("c++.clang.modules.strict", true) -- clang std module clash with stl headers, header units and c++23 std module so we disable it when using libc++
+
diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua
index 16e47a55d..4d035c42b 100644
--- a/tests/projects/c++/modules/dependence/xmake.lua
+++ b/tests/projects/c++/modules/dependence/xmake.lua
@@ -5,4 +5,3 @@ target("dependence")
     set_kind("binary")
     add_files("src/*.cpp", "src/*.mpp")
 
-    set_values("c++.clang.modules.strict", true) -- clang std module clash with stl headers, header units and c++23 std module so we disable it when using libc++
\ No newline at end of file
diff --git a/tests/projects/c++/modules/headerunits_person/xmake.lua b/tests/projects/c++/modules/headerunits_person/xmake.lua
index 93b635988..d11b49824 100644
--- a/tests/projects/c++/modules/headerunits_person/xmake.lua
+++ b/tests/projects/c++/modules/headerunits_person/xmake.lua
@@ -5,4 +5,3 @@ target("headerunits_person")
     set_kind("binary")

     add_files("src/*.cpp", "src/*.mpp")

 

-    set_values("c++.clang.modules.strict", true) -- clang std module clash with stl headers, header units and c++23 std module so we disable it
\ No newline at end of file
diff --git a/tests/projects/c++/modules/inline_and_template/xmake.lua b/tests/projects/c++/modules/inline_and_template/xmake.lua
index 57635eff3..8c981fae9 100644
--- a/tests/projects/c++/modules/inline_and_template/xmake.lua
+++ b/tests/projects/c++/modules/inline_and_template/xmake.lua
@@ -5,4 +5,3 @@ target("inline_and_template")
     set_kind("binary")
     add_files("src/*.cpp", "src/*.mpp")
 
-    set_values("c++.clang.modules.strict", true) -- clang std module clash with stl headers, header units and c++23 std module so we disable it when using libc++
\ No newline at end of file
diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua
index 134aee26c..8007553ed 100644
--- a/tests/projects/c++/modules/stdmodules/xmake.lua
+++ b/tests/projects/c++/modules/stdmodules/xmake.lua
@@ -5,7 +5,11 @@ target("mod")
     set_kind("static")
     add_files("src/*.cpp", "src/*.mpp")
 
+    set_values("c++.clang.module.stdmodules", true)
+
 target("stdmodules")
     set_kind("binary")
     add_files("test/*.cpp")
     add_deps("mod")
+
+    set_values("c++.clang.module.stdmodules", true)
diff --git a/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua b/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua
index 61d451908..330fa56f8 100644
--- a/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua
+++ b/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua
@@ -5,6 +5,10 @@ target("mod")
     set_kind("static")
     add_files("src/*.cpp", "src/*.mpp")
 
+    set_values("c++.clang.module.stdmodules", true)
+
 target("mod2")
     set_kind("static")
     add_files("src/*.cpp", "src/*.mpp")
+
+    set_values("c++.clang.module.stdmodules", true)
diff --git a/xmake/rules/c++/modules/modules_support/clang.lua b/xmake/rules/c++/modules/modules_support/clang.lua
index 7d843c3dd..19f6968c6 100644
--- a/xmake/rules/c++/modules/modules_support/clang.lua
+++ b/xmake/rules/c++/modules/modules_support/clang.lua
@@ -84,7 +84,7 @@ function load(target)
         target:add("cxxflags", modulestsflag)
     end
 
-    if not target:values("c++.clang.modules.strict") then
+    if target:values("c++.clang.modules.stdmodules") then
        target:add("cxxflags", builtinmodulemapflag, {force = true})
        target:add("cxxflags", implicitmodulesflag, {force = true})
     else