summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-07-06 21:58:50 +0800
committerGitHub <[email protected]>2024-07-06 21:58:50 +0800
commit1556ddbf9c1444eb07b836fa8c845ea7a099a8c5 (patch)
tree7f6d31825037fc9dfbf61096ed61bd8797e0e053
parentf56b497bd223e9d5e01291c8ef81ce3bf0d6e69d (diff)
parent1c5eb9a1af24388b878c60d379996029db072606 (diff)
Merge pull request #5312 from jingkaimori/jingkaimori/qt-ts-improvement
make qt.ts prefixdir option supports absolute path
-rw-r--r--xmake/rules/qt/ts/xmake.lua6
1 files changed, 5 insertions, 1 deletions
diff --git a/xmake/rules/qt/ts/xmake.lua b/xmake/rules/qt/ts/xmake.lua
index 6ddfeb703..95e44d2a2 100644
--- a/xmake/rules/qt/ts/xmake.lua
+++ b/xmake/rules/qt/ts/xmake.lua
@@ -53,7 +53,11 @@ rule("qt.ts")
local outputdir = target:targetdir()
local fileconfig = target:fileconfig(sourcefile_ts)
if fileconfig and fileconfig.prefixdir then
- outputdir = path.join(target:targetdir(), fileconfig.prefixdir)
+ if path.is_absolute(fileconfig.prefixdir) then
+ outputdir = fileconfig.prefixdir
+ else
+ outputdir = path.join(target:targetdir(), fileconfig.prefixdir)
+ end
end
local outfile = path.join(outputdir, path.basename(sourcefile_ts) .. ".qm")
batchcmds:mkdir(outputdir)