summaryrefslogtreecommitdiff
path: root/tests/projects/c++/modules/stdmodules
diff options
context:
space:
mode:
Diffstat (limited to 'tests/projects/c++/modules/stdmodules')
-rw-r--r--tests/projects/c++/modules/stdmodules/src/my_module.cpp4
-rw-r--r--tests/projects/c++/modules/stdmodules/src/my_module.mpp4
-rw-r--r--tests/projects/c++/modules/stdmodules/test.lua1
-rw-r--r--tests/projects/c++/modules/stdmodules/test/test.cpp4
-rw-r--r--tests/projects/c++/modules/stdmodules/xmake.lua5
5 files changed, 4 insertions, 14 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..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 _MSC_VER
-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 5c0e44bc9..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 _MSC_VER
-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.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..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 _MSC_VER
-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 ffe2d015b..85e738d14 100644
--- a/tests/projects/c++/modules/stdmodules/xmake.lua
+++ b/tests/projects/c++/modules/stdmodules/xmake.lua
@@ -1,10 +1,11 @@
add_rules("mode.debug", "mode.release")
-set_languages("c++20")
add_cxxflags("clang::-stdlib=libc++")
+set_languages("c++latest")
+
target("mod")
- set_kind("shared")
+ set_kind("static")
add_files("src/*.cpp", "src/*.mpp")
target("test")