From 8929c381e0cd70ff804e7c52bb3efc134e056e78 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Tue, 6 Feb 2024 18:31:13 +0100 Subject: implement target kind moduleonly --- tests/projects/c++/modules/link_order/xmake.lua | 8 ++++---- tests/projects/c++/modules/moduleonly/xmake.lua | 3 +-- .../c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua | 4 ++-- .../c++/modules/packages/my-repo/packages/b/bar2/xmake.lua | 2 +- tests/projects/c++/modules/user_headerunit2/a/xmake.lua | 4 ++-- tests/projects/c++/modules/user_headerunit2/b/xmake.lua | 4 ++-- 6 files changed, 12 insertions(+), 13 deletions(-) (limited to 'tests/projects/c++/modules') diff --git a/tests/projects/c++/modules/link_order/xmake.lua b/tests/projects/c++/modules/link_order/xmake.lua index 1ae6639bb..5c7b8a236 100644 --- a/tests/projects/c++/modules/link_order/xmake.lua +++ b/tests/projects/c++/modules/link_order/xmake.lua @@ -3,14 +3,14 @@ set_languages("c++20") target("foo") add_rules("c++") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") + add_files("src/foo.mpp") target("bar") add_rules("c++") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") + add_files("src/bar.mpp") target("link_order_1") diff --git a/tests/projects/c++/modules/moduleonly/xmake.lua b/tests/projects/c++/modules/moduleonly/xmake.lua index c6cb7cef4..54c681cc8 100644 --- a/tests/projects/c++/modules/moduleonly/xmake.lua +++ b/tests/projects/c++/modules/moduleonly/xmake.lua @@ -2,6 +2,5 @@ add_rules("mode.release", "mode.debug") set_languages("c++20") target("mod") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") add_files("src/mod.mpp") diff --git a/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua b/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua index 9312aee2d..905c38a02 100644 --- a/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua +++ b/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/src/xmake.lua @@ -2,6 +2,6 @@ add_rules("mode.release", "mode.debug") set_languages("c++20") target("bar2") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") + add_files("*.mpp") diff --git a/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/xmake.lua b/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/xmake.lua index e56cdaf43..343a52e02 100644 --- a/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/xmake.lua +++ b/tests/projects/c++/modules/packages/my-repo/packages/b/bar2/xmake.lua @@ -1,5 +1,5 @@ package("bar2") - set_kind("headeronly") + set_kind("moduleonly") set_sourcedir(path.join(os.scriptdir(), "src")) on_install(function(package) diff --git a/tests/projects/c++/modules/user_headerunit2/a/xmake.lua b/tests/projects/c++/modules/user_headerunit2/a/xmake.lua index 261428921..8d9a4cb8b 100644 --- a/tests/projects/c++/modules/user_headerunit2/a/xmake.lua +++ b/tests/projects/c++/modules/user_headerunit2/a/xmake.lua @@ -1,6 +1,6 @@ target("a") set_languages("cxxlatest") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") + add_headerfiles("*.hpp") add_files("a.mpp") diff --git a/tests/projects/c++/modules/user_headerunit2/b/xmake.lua b/tests/projects/c++/modules/user_headerunit2/b/xmake.lua index 9821fcd6d..5be8ae50b 100644 --- a/tests/projects/c++/modules/user_headerunit2/b/xmake.lua +++ b/tests/projects/c++/modules/user_headerunit2/b/xmake.lua @@ -1,6 +1,6 @@ target("b") add_deps("a") set_languages("cxxlatest") - set_kind("headeronly") - add_rules("c++.moduleonly") + set_kind("moduleonly") + add_files("b.mpp") -- cgit v1.3.1