From e20c6cafdb241ad6f858556c33463da1a092abdc Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Tue, 23 Jan 2024 18:22:52 +0100 Subject: improve module tests --- tests/projects/c++/modules/stdmodules/xmake.lua | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'tests/projects/c++/modules/stdmodules') diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua index 0603a4c51..c191839db 100644 --- a/tests/projects/c++/modules/stdmodules/xmake.lua +++ b/tests/projects/c++/modules/stdmodules/xmake.lua @@ -3,7 +3,8 @@ set_languages("c++latest") target("mod") set_kind("static") - add_files("src/*.cpp", "src/*.mpp") + add_files("src/*.cpp") + add_files("src/*.mpp", {public = true}) set_policy("build.c++.clang.stdmodules", true) target("stdmodules") -- cgit v1.3.1 From 0ff527aa2d4d4c318d5041d043327f4e70767c0a Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Tue, 30 Jan 2024 13:06:59 +0100 Subject: remove removed build.c++.clang.stdmodules policy from tests --- tests/projects/c++/modules/stdmodules/xmake.lua | 2 -- tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua | 1 - tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua | 4 ---- 3 files changed, 7 deletions(-) (limited to 'tests/projects/c++/modules/stdmodules') diff --git a/tests/projects/c++/modules/stdmodules/xmake.lua b/tests/projects/c++/modules/stdmodules/xmake.lua index c191839db..02447729c 100644 --- a/tests/projects/c++/modules/stdmodules/xmake.lua +++ b/tests/projects/c++/modules/stdmodules/xmake.lua @@ -5,10 +5,8 @@ target("mod") set_kind("static") add_files("src/*.cpp") add_files("src/*.mpp", {public = true}) - set_policy("build.c++.clang.stdmodules", true) target("stdmodules") set_kind("binary") add_files("test/*.cpp") add_deps("mod") - set_policy("build.c++.clang.stdmodules", true) diff --git a/tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua b/tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua index d7acc0d85..6f86e1efc 100644 --- a/tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua +++ b/tests/projects/c++/modules/stdmodules_cpp_only/xmake.lua @@ -6,5 +6,4 @@ target("stdmodules_cpp_only") set_kind("binary") add_files("src/*.cpp") set_policy("build.c++.modules", true) - set_policy("build.c++.clang.stdmodules", true) diff --git a/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua b/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua index 32bed613b..61d451908 100644 --- a/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua +++ b/tests/projects/c++/modules/stdmodules_multiple_targets/xmake.lua @@ -5,10 +5,6 @@ target("mod") set_kind("static") add_files("src/*.cpp", "src/*.mpp") - set_policy("build.c++.clang.stdmodules", true) - target("mod2") set_kind("static") add_files("src/*.cpp", "src/*.mpp") - - set_policy("build.c++.clang.stdmodules", true) -- cgit v1.3.1 From c11559ee96ac6289713365de62e04ddbbb6be7e0 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Tue, 6 Feb 2024 11:50:51 +0100 Subject: fix stdmodule find_file and update test (std module doesn't export ::size_t only std::size_t) --- tests/projects/c++/modules/stdmodules/src/my_module.cpp | 2 +- tests/projects/c++/modules/stdmodules/src/my_module.mpp | 2 +- xmake/rules/c++/modules/modules_support/clang/compiler_support.lua | 2 +- 3 files changed, 3 insertions(+), 3 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 b87808a6e..ab3119785 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.cpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.cpp @@ -2,4 +2,4 @@ module my_module; import std; -auto my_sum(size_t a, size_t b) -> size_t { return a + b; } +auto my_sum(std::size_t a, std::size_t b) -> std::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 bbebb2766..a1cd98e57 100644 --- a/tests/projects/c++/modules/stdmodules/src/my_module.mpp +++ b/tests/projects/c++/modules/stdmodules/src/my_module.mpp @@ -2,4 +2,4 @@ export module my_module; import std; -export auto my_sum(size_t a, size_t b) -> size_t; +export auto my_sum(std::size_t a, std::size_t b) -> std::size_t; diff --git a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua b/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua index 53da9a36c..fed5cb29d 100644 --- a/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua +++ b/xmake/rules/c++/modules/modules_support/clang/compiler_support.lua @@ -209,7 +209,7 @@ function get_stdmodules(target) -- @see https://github.com/llvm/llvm-project/pull/76451 (has been revert, so we need to wait) local clang_path = path.directory(get_clang_path(target)) local clang_lib_path = path.join(clang_path, "..", "lib") - local modules_json_path = find_file("**.modules.json", clang_lib_path) + local modules_json_path = find_file("*libc++.modules.json", clang_lib_path) if modules_json_path then local modules_json = json.decode(io.readfile(modules_json_path)) local std_module_directory = path.directory(modules_json.modules[1]["source-path"]) -- cgit v1.3.1