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/submodules/xmake.lua | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'tests/projects/c++/modules/submodules') diff --git a/tests/projects/c++/modules/submodules/xmake.lua b/tests/projects/c++/modules/submodules/xmake.lua index 672034947..5f2b4ca78 100644 --- a/tests/projects/c++/modules/submodules/xmake.lua +++ b/tests/projects/c++/modules/submodules/xmake.lua @@ -1,4 +1,8 @@ +add_rules("mode.release", "mode.debug") set_languages("c++20") -target("math") + +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 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/submodules') 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