diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2013-03-25 22:26:28 +0100 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-03-26 13:07:08 +0100 |
| commit | 7fb3c6bf3d51b7c2ef490dedba1c4ea69c4b5f28 (patch) | |
| tree | b649970a1f0d705d9aae3792b87a2517704e9251 /mkspecs/features | |
| parent | be431cc50a225abeafb4a2e5bf2495168e42401c (diff) | |
Fix the CMake tests with CMake release candidates.
The version number parsing needs to handle the reported version string.
Change-Id: Ifd34b2c86b21a1c5e4c91a43447468ca6feab8cf
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'mkspecs/features')
| -rw-r--r-- | mkspecs/features/ctest_testcase.prf | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mkspecs/features/ctest_testcase.prf b/mkspecs/features/ctest_testcase.prf index c2d1a6ad22..79adde3446 100644 --- a/mkspecs/features/ctest_testcase.prf +++ b/mkspecs/features/ctest_testcase.prf @@ -18,6 +18,8 @@ isEmpty(CMAKE_VERSION) { CMAKE_VERSION_MAJOR = $$section(CMAKE_VERSION, ., 0, 0) CMAKE_VERSION_MINOR = $$section(CMAKE_VERSION, ., 1, 1) CMAKE_VERSION_PATCH = $$section(CMAKE_VERSION, ., 2, 2) + # CMake can report versions like 2.8.11-rc1, so strip off the rc part. + CMAKE_VERSION_PATCH ~= s,-.*,, VERSION_OK = greaterThan(CMAKE_VERSION_MAJOR, 2) { |