diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-01-05 10:37:09 +0100 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-01-11 23:19:31 +0000 |
| commit | 479ca165d3df610a135f9129cb3cecb0a7c7e069 (patch) | |
| tree | 54685ddf20e1964e28915e850f8ea9581dbb6103 /configure.pri | |
| parent | c4e1aa2c4fff93c71eed3f8115170f314d969234 (diff) | |
Fix detection of system ninja and gn on Windows
On Windows we need to look for ninja.exe and gn.exe.
Change-Id: Ibdf7416135ecbb32974b6d23c6045b1d195439aa
Reviewed-by: Michal Klocek <michal.klocek@qt.io>
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.pri b/configure.pri index e3200120f..b6693aecf 100644 --- a/configure.pri +++ b/configure.pri @@ -1,6 +1,7 @@ +equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe defineTest(qtConfTest_detectNinja) { - ninja = $$qtConfFindInPath("ninja") + ninja = $$qtConfFindInPath("ninja$$EXE_SUFFIX") !isEmpty(ninja) { qtLog("Found ninja from path: $$ninja") qtRunLoggedCommand("$$ninja --version", version)|return(false) @@ -12,7 +13,7 @@ defineTest(qtConfTest_detectNinja) { } defineTest(qtConfTest_detectGn) { - gn = $$qtConfFindInPath("gn") + gn = $$qtConfFindInPath("gn$$EXE_SUFFIX") !isEmpty(gn) { qtRunLoggedCommand("$$gn --version", version)|return(false) #accept all for now |