summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorruki <[email protected]>2023-02-28 22:49:59 +0800
committerruki <[email protected]>2023-02-28 22:49:59 +0800
commit6627f5cfb7db944367c5668be2267402dc1ed7f5 (patch)
tree958b448399c5022fb71d3314678a1e4510dc02f3
parentfcc1ee94099948888d1e0fc45abb648448a04599 (diff)
improve to find qt sdk from msys2/mingw64
-rw-r--r--xmake/modules/detect/sdks/find_qt.lua8
1 files changed, 8 insertions, 0 deletions
diff --git a/xmake/modules/detect/sdks/find_qt.lua b/xmake/modules/detect/sdks/find_qt.lua
index d6734b292..315c57f55 100644
--- a/xmake/modules/detect/sdks/find_qt.lua
+++ b/xmake/modules/detect/sdks/find_qt.lua
@@ -79,6 +79,14 @@ function _find_sdkdir(sdkdir, sdkver)
end
if is_host("windows") then
+ -- we find it from /mingw64 first
+ if is_subhost("msys") then
+ local mingw_prefix = os.getenv("MINGW_PREFIX")
+ if mingw_prefix and os.isdir(mingw_prefix) then
+ table.insert(paths, mingw_prefix)
+ end
+ end
+
-- add paths from registry
local regs =
{