diff options
| author |  Lubomir I. Ivanov <neolit123@gmail.com> | 2013-10-10 01:18:48 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2013-10-09 15:47:20 -0700 |
| commit | a3ee9a11427c361ac23c0e7b14f1cb72eab34003 (patch) | |
| tree | 81d8d8393585a142213110f40ad85c749f53859f /subsurface-configure.pri | |
| parent | 9a37d6482684a2ece9c47b5776b72b2bad0a11b4 (diff) | |
| download | subsurface-a3ee9a11427c361ac23c0e7b14f1cb72eab34003.tar.gz | |
subsurface-configure.pri: pkg-config detection change
This is a small change, but it seems to work as expected on both
Linux and Win32. What happens if 2> NUL > NUL is used on Win32
for cmd.exe is that the output of both stdout and stderr seems
to pipe into NUL and pkg-config is always reported as missing.
Signed-off-by: Lubomir I. Ivanov <neolit123@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'subsurface-configure.pri')
| -rw-r--r-- | subsurface-configure.pri | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/subsurface-configure.pri b/subsurface-configure.pri index c06d1c14d..903d6a84d 100644 --- a/subsurface-configure.pri +++ b/subsurface-configure.pri @@ -28,7 +28,8 @@ CONFIG += exceptions_off # Check if we have pkg-config equals($$QMAKE_HOST.os, "Windows"):NUL=NUL else:NUL=/dev/null -system(pkg-config --version 2>$$NUL >$$NUL) { +PKG_CONFIG_OUT = $$system(pkg-config --version 2> $$NUL) +!isEmpty(PKG_CONFIG_OUT) { CONFIG += link_pkgconfig } else { message("pkg-config not found, no detection performed. See README for details") |