diff options
| author | Arthur LAURENT <[email protected]> | 2022-12-14 16:37:06 +0100 |
|---|---|---|
| committer | Arthur LAURENT <[email protected]> | 2022-12-14 17:57:18 +0100 |
| commit | edcda9c35c05a90c1e6e110b559de69d78d1cc06 (patch) | |
| tree | 8513af54a0d0dd2dbae0a06ff07d2571815f17c0 /tests/projects/c++/modules/stdmodules | |
| parent | 5dce8f69e3c7b3130bafb631c67529f4c0474955 (diff) | |
remove old msvc modules preview
Diffstat (limited to 'tests/projects/c++/modules/stdmodules')
4 files changed, 8 insertions, 47 deletions
diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp index 3d4711ceb..b87808a6e 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp @@ -1,9 +1,5 @@ module my_module; -#ifdef MSVC_MODULES -import std.core; -#else import std; -#endif auto my_sum(size_t a, size_t b) -> size_t { return a + b; } diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.mpp b/tests/projects/c++/modules/stdmodules/src/my_module.mpp index 38a8a90af..bbebb2766 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp @@ -1,9 +1,5 @@ export module my_module; -#ifdef MSVC_MODULES -import std.core; -#else import std; -#endif export auto my_sum(size_t a, size_t b) -> size_t; diff --git a/tests/projects/c++/modules/stdmodules/test/test.cpp b/tests/projects/c++/modules/stdmodules/test/test.cpp index 3deeff07e..7c6f7b4df 100644 --- a/tests/projects/c++/modules/stdmodules/test/test.cpp +++ b/tests/projects/c++/modules/stdmodules/test/test.cpp @@ -1,8 +1,4 @@ -#ifdef MSVC_MODULES -import std.core; -#else import std; -#endif import my_module; diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua index 92fa4b8f1..85e738d14 100644 --- a/tests/projects/c++/modules/stdmodules/xmake.lua +++ b/tests/projects/c++/modules/stdmodules/xmake.lua @@ -2,40 +2,13 @@ add_rules("mode.debug", "mode.release") add_cxxflags("clang::-stdlib=libc++") -option("stdifcsupport") - set_default(false) - set_showmenu(true) -option("stdimportsupport") - set_default(false) - set_showmenu(true) -option_end() +set_languages("c++latest") -if has_config("stdimportsupport") then - target("mod") - set_languages("c++latest") - set_kind("static") - add_files("src/*.cpp", "src/*.mpp") +target("mod") + 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 has_config("stdifcsupport") then - target("mod-msvcifc") - 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_kind("binary") - set_languages("c++latest", "clatest") - add_files("test/*.cpp") - add_deps("mod-msvcifc") - set_values("c++.msvc.enable_std_ifc", true) - add_defines("MSVC_MODULES") -end +target("test") + set_kind("binary") + add_files("test/*.cpp") + add_deps("mod") |