1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

CMake: Parse the output of new CMake versions.

Browse Source 
As of CMake 3.0, the output of `cmake --version` now has a second line
showing that it is maintained by Kitware. Change the version parsing to
look only at the first line of output.

Change-Id: I347de4c376e0bde25a43a38d59587d9b63f6b43a
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
This commit is contained in:
Stephen Kelly 2013-11-27 12:22:54 +01:00 committed by The Qt Project
parent 4fbe50e77a
commit 82a2d28d84
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
mkspecs/features/ctest_testcase_common.prf
View File

@ -1,10 +1,11 @@
win32 { win32 {
CMAKE_VERSION = $$system(cmake --version 2>NUL) CMAKE_VERSION = $$system(cmake --version 2>NUL, lines)
} else { } else {
CMAKE_VERSION = $$system(cmake --version 2>/dev/null) CMAKE_VERSION = $$system(cmake --version 2>/dev/null, lines)
} }
CMAKE_VERSION = $$member(CMAKE_VERSION, 0, 0)
check.commands = check.commands =
QMAKE_EXTRA_TARGETS *= check QMAKE_EXTRA_TARGETS *= check