From 1eca14c1a39eb899b23cd7560b9a0ea274f1c3e3 Mon Sep 17 00:00:00 2001 From: Arthur LAURENT Date: Mon, 5 Dec 2022 01:29:44 +0100 Subject: add support of prefixdir and installation configuration for modules --- xmake/rules/c++/modules/xmake.lua | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/xmake/rules/c++/modules/xmake.lua b/xmake/rules/c++/modules/xmake.lua index 5c90cd3ea..8d48cb0bf 100644 --- a/xmake/rules/c++/modules/xmake.lua +++ b/xmake/rules/c++/modules/xmake.lua @@ -141,7 +141,17 @@ rule("c++.build.modules.install") if common.contains_modules(target) then local sourcebatch = target:sourcebatches()["c++.build.modules.install"] if sourcebatch then - target:add("installfiles", sourcebatch.sourcefiles, {prefixdir = "include"}) + for _, sourcefile in sourcebatch.sourcefiles do + local prefixdir = "modules" + local fileconfig = target:fileconfig(sourcefile) + if fileconfig and fileconfig.prefixdir then + prefixdir = fileconfig.prefixdir + end + local install = (fileconfig and not fileconfig.install) and false or true + if install then + target:add("installfiles", sourcefile, {prefixdir = prefixdir}) + end + end end end end) -- cgit v1.3.1