Skip to content

Commit eb306ab

Browse files
committedMay 27, 2024·
fix require wix version
1 parent 3cc3158 commit eb306ab

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed
 

‎xmake/plugins/pack/wix/main.lua

+3-2
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,8 @@ function _get_wix()
3131

3232
-- find makensis
3333
local packages = {}
34-
local wix = find_tool("wix", {require_version = ">=4.0.0"})
34+
local require_version = ">=4.0.0"
35+
local wix = find_tool("wix", {require_version = require_version})
3536
if not wix then
3637
table.join2(packages, install_packages("wixtoolset"))
3738
end
@@ -43,7 +44,7 @@ function _get_wix()
4344

4445
-- we need to force detect and flush detect cache after loading all environments
4546
if not wix then
46-
wix = find_tool("wix", {force = true})
47+
wix = find_tool("wix", {force = true, require_version = require_version})
4748
end
4849
assert(wix, "wix not found (ensure that wix is up to date)!")
4950
return wix, oldenvs

0 commit comments

Comments
 (0)
Please sign in to comment.