diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-26 19:22:17 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com> | 2016-08-30 13:24:02 +0000 |
| commit | 85f2bdea445d3e1c610d81e57795290bc0e4a503 (patch) | |
| tree | 9b39d405883383abb436ae463114611a6282133c /configure.pri | |
| parent | 95eed6278a42ac43cb96c0d178bad0103e9de5cc (diff) | |
unbreak pkg-config use with cache
test callbacks MUST NOT act as outputs, ever.
this went unnoticed so far, as it would become visible only with
configure -recheck.
Change-Id: Idd923097b4b2790ef4fe8a6d430db4b62851801a
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Diffstat (limited to 'configure.pri')
| -rw-r--r-- | configure.pri | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/configure.pri b/configure.pri index 21ceb68d33..8c87aaed81 100644 --- a/configure.pri +++ b/configure.pri @@ -191,9 +191,6 @@ defineTest(qtConfTest_detectPkgConfig) { $${1}.cache += pkgConfig export($${1}.cache) - PKG_CONFIG = $$pkgConfig - export(PKG_CONFIG) - return(true) } @@ -526,6 +523,8 @@ defineTest(qtConfOutput_qreal) { defineTest(qtConfOutput_pkgConfig) { !$${2}: return() + PKG_CONFIG = $$eval(config.tests.pkg-config.pkgConfig) + export(PKG_CONFIG) # this method also exports PKG_CONFIG_(LIB|SYSROOT)DIR, so that tests using pkgConfig will work correctly PKG_CONFIG_SYSROOT_DIR = $$eval(config.tests.pkg-config.pkgConfigSysrootDir) !isEmpty(PKG_CONFIG_SYSROOT_DIR) { |