From 181a337b4092af6691d8e2e135d21dae4a03556a Mon Sep 17 00:00:00 2001
From: ruki <waruqi@gmail.com>
Date: Sat, 5 Nov 2022 00:38:31 +0800
Subject: improve std modules for msvc

---
 tests/projects/c++/modules/stdmodules/src/my_module.cpp | 6 +++++-
 tests/projects/c++/modules/stdmodules/src/my_module.mpp | 6 +++++-
 tests/projects/c++/modules/stdmodules/test/test.cpp     | 6 ++++++
 tests/projects/c++/modules/stdmodules/xmake.lua         | 1 +
 4 files changed, 17 insertions(+), 2 deletions(-)

(limited to 'tests/projects/c++/modules/stdmodules')

diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp
index 829be43e3..5264da821 100644
--- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp
+++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp
@@ -1,5 +1,9 @@
 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; }
\ No newline at end of file
+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 196b33381..5c0e44bc9 100644
--- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp
+++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp
@@ -1,5 +1,9 @@
 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;
\ No newline at end of file
+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 050715c4f..380f02838 100644
--- a/tests/projects/c++/modules/stdmodules/test/test.cpp
+++ b/tests/projects/c++/modules/stdmodules/test/test.cpp
@@ -1,5 +1,11 @@
 #include <stdio.h>
+
+#ifdef _MSC_VER
+import std.core;
+#else
 import std;
+#endif
+
 import my_module;
 
 int main(int argc, char** argv) {
diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua
index 1c699bb80..b3521e74b 100644
--- a/tests/projects/c++/modules/stdmodules/xmake.lua
+++ b/tests/projects/c++/modules/stdmodules/xmake.lua
@@ -2,6 +2,7 @@ add_rules("mode.debug", "mode.release")
 set_languages("c++20")
 
 add_cxxflags("clang::-stdlib=libc++")
+set_values("msvc.modules.stdifcdir", true)
 target("mod")
     set_kind("shared")
     add_files("src/*.cpp", "src/*.mpp")
-- 
cgit v1.3.1