fix build.c++.modules.tryreuse deps orders

5 files changed, 36 insertions, 0 deletions

diff --git a/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.cpp b/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.cpp
new file mode 100644
index 000000000..5b9d1194e
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.cpp
@@ -0,0 +1,5 @@
+module foo;
+
+auto my_sum(int a, int b) -> int {
+    return a + b;
+}
diff --git a/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.mpp b/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.mpp
new file mode 100644
index 000000000..4c9a649ca
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps_ordering/src/foo.mpp
@@ -0,0 +1,3 @@
+export module foo;
+
+export auto my_sum(int a, int b) -> int;
diff --git a/tests/projects/c++/modules/stdmodules_deps_ordering/src/main.cpp b/tests/projects/c++/modules/stdmodules_deps_ordering/src/main.cpp
new file mode 100644
index 000000000..1f87ceb59
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps_ordering/src/main.cpp
@@ -0,0 +1,8 @@
+import foo;
+
+import std;
+
+int main() {
+    std::cout << my_sum(1, 2) << std::endl;
+    return 0;
+}
diff --git a/tests/projects/c++/modules/stdmodules_deps_ordering/test.lua b/tests/projects/c++/modules/stdmodules_deps_ordering/test.lua
new file mode 100644
index 000000000..e77adc4ae
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps_ordering/test.lua
@@ -0,0 +1 @@
+inherit(".test_stdmodules")
diff --git a/tests/projects/c++/modules/stdmodules_deps_ordering/xmake.lua b/tests/projects/c++/modules/stdmodules_deps_ordering/xmake.lua
new file mode 100644
index 000000000..09c3f6a94
--- /dev/null
+++ b/tests/projects/c++/modules/stdmodules_deps_ordering/xmake.lua
@@ -0,0 +1,19 @@
+add_rules("mode.debug", "mode.release")
+set_languages("c++latest")
+
+-- test that a plain c++ file is ordered after all the bmis it reuses from its deps,
+-- not only after the last one
+--
+-- @note foo must not import std, otherwise its bmi and the std bmi
+-- would not be built by two distinct jobs of the foo target
+--
+-- @see https://github.com/xmake-io/xmake/issues/7690
+target("foo")
+    set_kind("static")
+    add_files("src/foo.cpp")
+    add_files("src/foo.mpp", {public = true})
+
+target("main")
+    set_kind("binary")
+    add_deps("foo")
+    add_files("src/main.cpp")