From f2ea9f6021fcb21ad0f8fc42d3bc78a3ae7d2283 Mon Sep 17 00:00:00 2001 From: ruki Date: Thu, 3 Nov 2022 22:52:10 +0800 Subject: improve clang to support std modules --- tests/projects/c++/modules/stdmodules/src/my_module.cpp | 5 +++++ tests/projects/c++/modules/stdmodules/src/my_module.mpp | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 tests/projects/c++/modules/stdmodules/src/my_module.cpp create mode 100644 tests/projects/c++/modules/stdmodules/src/my_module.mpp (limited to 'tests/projects/c++/modules/stdmodules/src') diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.cpp b/tests/projects/c++/modules/stdmodules/src/my_module.cpp new file mode 100644 index 000000000..829be43e3 --- /dev/null +++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp @@ -0,0 +1,5 @@ +module my_module; + +import std; + +auto my_sum(size_t a, size_t b) -> size_t { return a + b; } \ No newline at end of file diff --git a/tests/projects/c++/modules/stdmodules/src/my_module.mpp b/tests/projects/c++/modules/stdmodules/src/my_module.mpp new file mode 100644 index 000000000..196b33381 --- /dev/null +++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp @@ -0,0 +1,5 @@ +export module my_module; + +import std; + +export auto my_sum(size_t a, size_t b) -> size_t; \ No newline at end of file -- cgit v1.3.1 From 181a337b4092af6691d8e2e135d21dae4a03556a Mon Sep 17 00:00:00 2001 From: ruki Date: Sat, 5 Nov 2022 00:38:31 +0800 Subject: improve std modules for msvc --- .../c++/modules/stdmodules/src/my_module.cpp | 6 +++++- .../c++/modules/stdmodules/src/my_module.mpp | 6 +++++- .../projects/c++/modules/stdmodules/test/test.cpp | 6 ++++++ tests/projects/c++/modules/stdmodules/xmake.lua | 1 + xmake/rules/c++/modules/modules_support/msvc.lua | 25 +++++++++++++--------- 5 files changed, 32 insertions(+), 12 deletions(-) (limited to 'tests/projects/c++/modules/stdmodules/src') 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 + +#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") diff --git a/xmake/rules/c++/modules/modules_support/msvc.lua b/xmake/rules/c++/modules/modules_support/msvc.lua index 04ab2bf7a..b57ac4520 100644 --- a/xmake/rules/c++/modules/modules_support/msvc.lua +++ b/xmake/rules/c++/modules/modules_support/msvc.lua @@ -126,25 +126,30 @@ end -- load module support for the current target function load(target) - -- get flags - local modulesflag = get_modulesflag(target) -- add modules flags + local modulesflag = get_modulesflag(target) target:add("cxxflags", modulesflag) -- add stdifcdir in case of if the user ask for it - if target:values("msvc.modules.stdifcdir") then - local stdifcdirflag = get_stdifcdirflag(target) - for _, toolchain_inst in ipairs(target:toolchains()) do - if toolchain_inst:name() == "msvc" then - local vcvars = toolchain_inst:config("vcvars") - if vcvars.VCInstallDir and vcvars.VCToolsVersion then - local stdifcdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "ifc", target:is_arch("x64") and "x64" or "x86") + local stdifcdirflag = get_stdifcdirflag(target) + if stdifcdirflag then + local msvc = target:toolchain("msvc") + if msvc then + local vcvars = msvc:config("vcvars") + if vcvars.VCInstallDir and vcvars.VCToolsVersion then + local arch + if target:is_arch("x64", "x86_64") then + arch = "x64" + elseif target:is_arch("x86", "i386") then + arch = "x86" + end + if arch then + local stdifcdir = path.join(vcvars.VCInstallDir, "Tools", "MSVC", vcvars.VCToolsVersion, "ifc", arch) if os.isdir(stdifcdir) then target:add("cxxflags", {stdifcdirflag, winos.short_path(stdifcdir)}, {force = true, expand = false}) end end - break end end end -- cgit v1.3.1