From f314e4eb068e04e4b311feffffaf427ea25ef9bd Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Tue, 13 Dec 2022 22:12:22 +0100 Subject: fix tests --- tests/projects/c++/modules/stdmodules/xmake.lua | 33 ++++++++++++++++--------- 1 file changed, 22 insertions(+), 11 deletions(-) (limited to 'tests/projects/c++/modules/stdmodules') diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua index 176e8b5a6..92fa4b8f1 100644 --- a/tests/projects/c++/modules/stdmodules/xmake.lua +++ b/tests/projects/c++/modules/stdmodules/xmake.lua @@ -1,28 +1,39 @@ add_rules("mode.debug", "mode.release") -set_languages("c++23") add_cxxflags("clang::-stdlib=libc++") -target("mod") - set_kind("static") - add_files("src/*.cpp", "src/*.mpp") +option("stdifcsupport") + set_default(false) + set_showmenu(true) +option("stdimportsupport") + set_default(false) + set_showmenu(true) +option_end() -target("test") - set_kind("binary") - add_files("test/*.cpp") - add_deps("mod") +if has_config("stdimportsupport") then + target("mod") + set_languages("c++latest") + set_kind("static") + add_files("src/*.cpp", "src/*.mpp") + + target("test") + set_kind("binary") + set_languages("c++latest") + add_files("test/*.cpp") + add_deps("mod") +end -if is_plat("windows") then +if has_config("stdifcsupport") then target("mod-msvcifc") - set_languages("c++20") set_kind("static") + set_languages("c++latest", "clatest") add_files("src/*.cpp", "src/*.mpp") set_values("c++.msvc.enable_std_ifc", true) add_defines("MSVC_MODULES") target("test-msvcifc") - set_languages("c++20") set_kind("binary") + set_languages("c++latest", "clatest") add_files("test/*.cpp") add_deps("mod-msvcifc") set_values("c++.msvc.enable_std_ifc", true) -- cgit v1.3.1