From 3755a6f67399b8e42df9f39ec7c506918dbb433a Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Sat, 7 Jan 2023 17:44:36 +0100 Subject: reenable old clang modules by default and fix tests --- tests/projects/c++/modules/dependence/xmake.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'tests/projects/c++/modules/dependence/xmake.lua') diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua index 6d64b49b1..b4ecdb1b9 100644 --- a/tests/projects/c++/modules/dependence/xmake.lua +++ b/tests/projects/c++/modules/dependence/xmake.lua @@ -1,4 +1,10 @@ +add_rules("mode.release", "mode.debug") set_languages("c++20") + target("dependence") set_kind("binary") add_files("src/*.cpp", "src/*.mpp") + + if has_config("libc++") then + 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++ + end \ No newline at end of file -- cgit v1.3.1 From 4649cb58b79453c8f3a6b5277125d2f8ece9c233 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 11 Jan 2023 14:10:14 +0100 Subject: cleanup --- tests/projects/c++/modules/dependence/xmake.lua | 4 +--- tests/projects/c++/modules/link_order/xmake.lua | 5 ----- tests/projects/c++/modules/partitions2/xmake.lua | 2 -- tests/projects/c++/modules/submodules/xmake.lua | 2 -- 4 files changed, 1 insertion(+), 12 deletions(-) (limited to 'tests/projects/c++/modules/dependence/xmake.lua') diff --git a/tests/projects/c++/modules/dependence/xmake.lua b/tests/projects/c++/modules/dependence/xmake.lua index b4ecdb1b9..16e47a55d 100644 --- a/tests/projects/c++/modules/dependence/xmake.lua +++ b/tests/projects/c++/modules/dependence/xmake.lua @@ -5,6 +5,4 @@ target("dependence") set_kind("binary") add_files("src/*.cpp", "src/*.mpp") - if has_config("libc++") then - 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++ - end \ No newline at end of file + 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/link_order/xmake.lua b/tests/projects/c++/modules/link_order/xmake.lua index c6310055c..6a11418ac 100644 --- a/tests/projects/c++/modules/link_order/xmake.lua +++ b/tests/projects/c++/modules/link_order/xmake.lua @@ -1,8 +1,3 @@ -option("libc++") - set_default(false) - set_showmenu(true) -option_end() - add_rules("mode.release", "mode.debug") set_languages("c++20") diff --git a/tests/projects/c++/modules/partitions2/xmake.lua b/tests/projects/c++/modules/partitions2/xmake.lua index 1dfd2321b..9e0ab37bb 100644 --- a/tests/projects/c++/modules/partitions2/xmake.lua +++ b/tests/projects/c++/modules/partitions2/xmake.lua @@ -4,5 +4,3 @@ set_languages("c++20") target("partition2") 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/submodules/xmake.lua b/tests/projects/c++/modules/submodules/xmake.lua index 5f2b4ca78..e84b63a9f 100644 --- a/tests/projects/c++/modules/submodules/xmake.lua +++ b/tests/projects/c++/modules/submodules/xmake.lua @@ -4,5 +4,3 @@ set_languages("c++20") target("submodule") 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++ -- cgit v1.3.1 From 429ff39f5874e63741aecbe3dfdc15d790e0fb44 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Wed, 11 Jan 2023 14:47:19 +0100 Subject: rename clang std modulemap enabler and disable it by default --- tests/projects/c++/modules/class/xmake.lua | 2 +- tests/projects/c++/modules/dependence/xmake.lua | 1 - tests/projects/c++/modules/headerunits_person/xmake.lua | 1 - tests/projects/c++/modules/inline_and_template/xmake.lua | 1 - tests/projects/c++/modules/stdmodules/xmake.lua | 4 ++++ tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua | 4 ++++ xmake/rules/c++/modules/modules_support/clang.lua | 2 +- 7 files changed, 10 insertions(+), 5 deletions(-) (limited to 'tests/projects/c++/modules/dependence/xmake.lua') 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 -- cgit v1.3.1