summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2024-05-28 00:49:34 +0800
committerruki <[email protected]>2024-05-28 00:49:34 +0800
commiteb306abadd73036109546fff204d28a9b1d3d264 (patch)
tree88c4a785028f1d168eac18787bed9ee631912fd2
parent3cc3158ba9bb4a75ab600876efa538de851bdaee (diff)
fix require wix version
-rw-r--r--xmake/plugins/pack/wix/main.lua5
1 files changed, 3 insertions, 2 deletions
diff --git a/xmake/plugins/pack/wix/main.lua b/xmake/plugins/pack/wix/main.lua
index 9b0a2232e..e6befb85a 100644
--- a/xmake/plugins/pack/wix/main.lua
+++ b/xmake/plugins/pack/wix/main.lua
@@ -31,7 +31,8 @@ function _get_wix()
-- find makensis
local packages = {}
- local wix = find_tool("wix", {require_version = ">=4.0.0"})
+ local require_version = ">=4.0.0"
+ local wix = find_tool("wix", {require_version = require_version})
if not wix then
table.join2(packages, install_packages("wixtoolset"))
end
@@ -43,7 +44,7 @@ function _get_wix()
-- we need to force detect and flush detect cache after loading all environments
if not wix then
- wix = find_tool("wix", {force = true})
+ wix = find_tool("wix", {force = true, require_version = require_version})
end
assert(wix, "wix not found (ensure that wix is up to date)!")
return wix, oldenvs