diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-12 19:21:56 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-12 19:21:56 +0100 |
| commit | aff3f765da3cd344bd0f8903ccd0d73b04fd9721 (patch) | |
| tree | 5bc1d7a427816eac85f96dde49d006adf9001785 /tests/projects | |
| parent | 2347d4ab4bf5d9bb3e5a9f67423df51313553b7e (diff) | |
update test
Diffstat (limited to 'tests/projects')
5 files changed, 23 insertions, 5 deletions
diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp index 5264da821..3d4711ceb 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp @@ -1,6 +1,6 @@ module my_module; -#ifdef _MSC_VER +#ifdef MSVC_MODULES import std.core; #else import std; diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.mpp b/tests/projects/c++/modules/stdmodules/src/my_module.mpp index 5c0e44bc9..38a8a90af 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp @@ -1,6 +1,6 @@ export module my_module; -#ifdef _MSC_VER +#ifdef MSVC_MODULES import std.core; #else import std; diff --git a/tests/projects/c++/modules/stdmodules/test.lua b/tests/projects/c++/modules/stdmodules/test.lua new file mode 100644 index 000000000..0657ead56 --- /dev/null +++ b/tests/projects/c++/modules/stdmodules/test.lua @@ -0,0 +1 @@ +inherit(".test_msvc") diff --git a/tests/projects/c++/modules/stdmodules/test/test.cpp b/tests/projects/c++/modules/stdmodules/test/test.cpp index a12813c24..3deeff07e 100644 --- a/tests/projects/c++/modules/stdmodules/test/test.cpp +++ b/tests/projects/c++/modules/stdmodules/test/test.cpp @@ -1,4 +1,4 @@ -#ifdef _MSC_VER +#ifdef MSVC_MODULES import std.core; #else import std; diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua index ffe2d015b..176e8b5a6 100644 --- a/tests/projects/c++/modules/stdmodules/xmake.lua +++ b/tests/projects/c++/modules/stdmodules/xmake.lua @@ -1,13 +1,30 @@ add_rules("mode.debug", "mode.release") -set_languages("c++20") +set_languages("c++23") add_cxxflags("clang::-stdlib=libc++") target("mod") - set_kind("shared") + set_kind("static") add_files("src/*.cpp", "src/*.mpp") target("test") set_kind("binary") add_files("test/*.cpp") add_deps("mod") + +if is_plat("windows") then + target("mod-msvcifc") + set_languages("c++20") + set_kind("static") + 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") + add_files("test/*.cpp") + add_deps("mod-msvcifc") + set_values("c++.msvc.enable_std_ifc", true) + add_defines("MSVC_MODULES") +end |