From eb306abadd73036109546fff204d28a9b1d3d264 Mon Sep 17 00:00:00 2001 From: ruki Date: Tue, 28 May 2024 00:49:34 +0800 Subject: fix require wix version --- xmake/plugins/pack/wix/main.lua | 5 +++-- 1 file 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 -- cgit v1.3.1