diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2013-01-25 17:05:00 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-02-13 12:42:40 +0100 |
| commit | 8204e3f04534328e554c092758717aa4e0cc073e (patch) | |
| tree | 02d6af86697d528537dd05f6a37068f8b3fba851 /src/angle/src/config.pri | |
| parent | e3554d72745d9c439b1792c20be09871506afeef (diff) | |
fix angle build under msys
use library function which deals with shell specifics to set up PATH
Task-number: QTBUG-29427
Change-Id: Ic2bed4d7f0eb072bcce6a9f99be02d3cd08a7c98
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>
Diffstat (limited to 'src/angle/src/config.pri')
| -rw-r--r-- | src/angle/src/config.pri | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/angle/src/config.pri b/src/angle/src/config.pri index 63792b9899..f8b877d056 100644 --- a/src/angle/src/config.pri +++ b/src/angle/src/config.pri @@ -13,17 +13,17 @@ isEmpty(ANGLE_DIR) { } win32 { - GNUTOOLS_DIR = $$absolute_path(../../../../gnuwin32/bin) - exists($$GNUTOOLS_DIR/gperf.exe) { - # Escape closing parens when expanding the variable, otherwise cmd confuses itself. - GNUTOOLS = "(set PATH=$$replace(GNUTOOLS_DIR, [/\\\\], $${QMAKE_DIR_SEP});%PATH:)=^)%)" + gnutools.value = $$absolute_path(../../../../gnuwin32/bin) + exists($$gnutools.value/gperf.exe) { + gnutools.name = PATH + gnutools.CONFIG = prepend } } defineReplace(addGnuPath) { gnuPath = $$1 - !isEmpty(gnuPath):!isEmpty(GNUTOOLS) { - gnuPath = $${GNUTOOLS} && $$gnuPath + !isEmpty(gnuPath):!isEmpty(gnutools.name) { + qtAddToolEnv(gnuPath, gnutools) silent: gnuPath = @echo generating sources from ${QMAKE_FILE_IN} && $$gnuPath } return($$gnuPath) |