From 355b3c3baef1faa6884fbaf46990cabbe18df468 Mon Sep 17 00:00:00 2001 From: ruki Date: Fri, 18 Sep 2020 22:37:14 +0800 Subject: improve cmake tools again --- xmake/modules/package/tools/cmake.lua | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/xmake/modules/package/tools/cmake.lua b/xmake/modules/package/tools/cmake.lua index de4f83051..b9539b8b4 100644 --- a/xmake/modules/package/tools/cmake.lua +++ b/xmake/modules/package/tools/cmake.lua @@ -276,7 +276,7 @@ function build(package, configs, opt) end if is_host("bsd") then os.vrunv("gmake", argv) - elseif is_subhost("windows") and is_plat("mingw") then + elseif is_subhost("windows") and package:is_plat("mingw") then local mingw = assert(package:build_getenv("mingw") or package:build_getenv("sdk"), "mingw not found!") local mingw_make = path.join(mingw, "bin", "mingw32-make.exe") os.vrunv(mingw_make, argv) @@ -346,7 +346,7 @@ function install(package, configs, opt) if is_host("bsd") then os.vrunv("gmake", argv) os.vrunv("gmake", {"install"}) - elseif is_subhost("windows") and is_plat("mingw") then + elseif is_subhost("windows") and package:is_plat("mingw") then local mingw = assert(package:build_getenv("mingw") or package:build_getenv("sdk"), "mingw not found!") local mingw_make = path.join(mingw, "bin", "mingw32-make.exe") os.vrunv(mingw_make, argv) -- cgit v1.3.1