diff options
| author | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-08-30 11:32:59 +0200 |
|---|---|---|
| committer | Joerg Bornemann <joerg.bornemann@qt.io> | 2017-09-11 08:57:28 +0000 |
| commit | 448814bf4f472e7a51873ba95234576fd58579b3 (patch) | |
| tree | 29ff99ef76b03c98a4a7874b0118111a92d5bb86 /configure.pri | |
| parent | f32b3514a5186bc4f5452f004324bdb7782d30a3 (diff) | |
Pick up GNU tools from the mother repo's gnuwin32 directory
This makes it unnecessary to have gperf, bison and flex in PATH.
Change-Id: Ie4a0dea4452e3a38067b47eb41c3e9904274e175
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 19 |
1 files changed, 16 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 0030ce3bb..412e1e91b 100644 --- a/configure.pri +++ b/configure.pri @@ -1,3 +1,6 @@ +# this must be done outside any function +QTWEBENGINE_SOURCE_TREE = $$PWD + equals(QMAKE_HOST.os, Windows): EXE_SUFFIX = .exe defineTest(isPythonVersionSupported) { @@ -41,8 +44,18 @@ defineTest(qtConfTest_detectPython2) { return(true) } +defineReplace(qtConfFindGnuTool) { + equals(QMAKE_HOST.os, Windows) { + gnuwin32bindir = $$absolute_path($$QTWEBENGINE_SOURCE_TREE/../gnuwin32/bin) + gnuwin32toolpath = "$$gnuwin32bindir/$${1}" + exists($$gnuwin32toolpath): \ + return($$gnuwin32toolpath) + } + return($$qtConfFindInPath($$1)) +} + defineTest(qtConfTest_detectGperf) { - gperf = $$qtConfFindInPath("gperf$$EXE_SUFFIX") + gperf = $$qtConfFindGnuTool("gperf$$EXE_SUFFIX") isEmpty(gperf) { qtLog("Required gperf could not be found.") return(false) @@ -52,7 +65,7 @@ defineTest(qtConfTest_detectGperf) { } defineTest(qtConfTest_detectBison) { - bison = $$qtConfFindInPath("bison$$EXE_SUFFIX") + bison = $$qtConfFindGnuTool("bison$$EXE_SUFFIX") isEmpty(bison) { qtLog("Required bison could not be found.") return(false) @@ -62,7 +75,7 @@ defineTest(qtConfTest_detectBison) { } defineTest(qtConfTest_detectFlex) { - flex = $$qtConfFindInPath("flex$$EXE_SUFFIX") + flex = $$qtConfFindGnuTool("flex$$EXE_SUFFIX") isEmpty(flex) { qtLog("Required flex could not be found.") return(false) |