diff options
5 files changed, 6 insertions, 11 deletions
diff --git a/tests/projects/c++/modules/partitions/src/main.cpp b/tests/projects/c++/modules/partitions/src/main.cpp index eaaec9565..058dfd522 100644 --- a/tests/projects/c++/modules/partitions/src/main.cpp +++ b/tests/projects/c++/modules/partitions/src/main.cpp @@ -1,4 +1,5 @@ -import std.core; +#include <iostream> + import math; int main() { diff --git a/tests/projects/c++/modules/partitions/xmake.lua b/tests/projects/c++/modules/partitions/xmake.lua index 36697f3e8..672034947 100644 --- a/tests/projects/c++/modules/partitions/xmake.lua +++ b/tests/projects/c++/modules/partitions/xmake.lua @@ -1,7 +1,4 @@ set_languages("c++20") target("math") set_kind("binary") - add_files("src/*.cpp") - add_files("src/math1.mpp") - add_files("src/math2.mpp") - add_files("src/math.mpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/tests/projects/c++/modules/submodules/src/main.cpp b/tests/projects/c++/modules/submodules/src/main.cpp index eaaec9565..5ff18701f 100644 --- a/tests/projects/c++/modules/submodules/src/main.cpp +++ b/tests/projects/c++/modules/submodules/src/main.cpp @@ -1,4 +1,4 @@ -import std.core; +#include <iostream> import math; int main() { diff --git a/tests/projects/c++/modules/submodules/xmake.lua b/tests/projects/c++/modules/submodules/xmake.lua index 36697f3e8..672034947 100644 --- a/tests/projects/c++/modules/submodules/xmake.lua +++ b/tests/projects/c++/modules/submodules/xmake.lua @@ -1,7 +1,4 @@ set_languages("c++20") target("math") set_kind("binary") - add_files("src/*.cpp") - add_files("src/math1.mpp") - add_files("src/math2.mpp") - add_files("src/math.mpp") + add_files("src/*.cpp", "src/*.mpp") diff --git a/xmake/rules/c++/modules/build_modulefiles.lua b/xmake/rules/c++/modules/build_modulefiles.lua index a8f0052a8..efc1c3a38 100644 --- a/xmake/rules/c++/modules/build_modulefiles.lua +++ b/xmake/rules/c++/modules/build_modulefiles.lua @@ -67,7 +67,7 @@ function _build_modulefiles_clang(target, sourcebatch, opt) import("private.action.build.object").build(target, sourcebatch, opt) -- add module files - target:add("cxxflags", opt.modulesflag, "-fmodules-cache-path=" .. cachedir) + target:add("cxxflags", modulesflag, "-fmodules-cache-path=" .. cachedir) for _, modulefile in ipairs(modulefiles) do target:add("cxxflags", "-fmodule-file=" .. modulefile) end |