diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-10-02 09:23:31 +0300 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2017-10-02 08:43:38 +0000 |
| commit | ec16ba393baf504d4b192cc349775c62d3c96aa0 (patch) | |
| tree | d2e00f15382ecec5c4737efc233a503e7d38d22d /mkspecs/features/ctest_testcase_common.prf | |
| parent | 8883e44eca057dce04e94bce50d41c472e4e8f00 (diff) | |
Revert "Qmake: Introduce and use QMAKE_NULL_DEVICE variable"v5.9.2
With that change QNX7 builds in windows will fail.
This reverts commit b4e9cb4c29ef797fe535a84717bebf81fbdc61e4.
Task-number: QTBUG-63535
Change-Id: Ia91d173803af62d41d1a7e5832bab911920f590d
Reviewed-by: Frederik Gladhorn <frederik.gladhorn@qt.io>
Diffstat (limited to 'mkspecs/features/ctest_testcase_common.prf')
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index 15701b6a41..cdc5cca1d7 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -1,5 +1,10 @@ -CMAKE_VERSION = $$system(cmake --version 2>$$QMAKE_NULL_DEVICE, lines) +win32 { + CMAKE_VERSION = $$system(cmake --version 2>NUL, lines) +} else { + CMAKE_VERSION = $$system(cmake --version 2>/dev/null, lines) +} + CMAKE_VERSION = $$member(CMAKE_VERSION, 0, 0) check.commands = @@ -10,7 +15,12 @@ isEmpty(CMAKE_VERSION) { return() } -CTEST_VERSION = $$system(ctest --version 2>$$QMAKE_NULL_DEVICE) +win32 { + CTEST_VERSION = $$system(ctest --version 2>NUL) +} else { + CTEST_VERSION = $$system(ctest --version 2>/dev/null) +} + isEmpty(CTEST_VERSION) { message("ctest executable not found. Not running CMake unit tests") return() |