diff options
| author | Alexander Volkov <a.volkov@rusbitech.ru> | 2017-03-21 10:40:11 +0300 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@qt.io> | 2017-08-02 21:08:07 +0000 |
| commit | bf6ae8406bc714828c7746f6abd611b66bbeb363 (patch) | |
| tree | 61b3bd11152f8d5af2620a2ba0d008f6b9f2c475 /mkspecs/features/ctest_testcase_common.prf | |
| parent | 6b38758084a10e210aed5a22110717ccc29ec5f8 (diff) | |
Compare versions in qmake files with versionAtLeast
Change-Id: Iba5686131d9f3e22e9a4d6da473a61a845b0418e
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@qt.io>
Diffstat (limited to 'mkspecs/features/ctest_testcase_common.prf')
| -rw-r--r-- | mkspecs/features/ctest_testcase_common.prf | 16 |
1 files changed, 1 insertions, 15 deletions
diff --git a/mkspecs/features/ctest_testcase_common.prf b/mkspecs/features/ctest_testcase_common.prf index cdc5cca1d7..4c7e03f0f7 100644 --- a/mkspecs/features/ctest_testcase_common.prf +++ b/mkspecs/features/ctest_testcase_common.prf @@ -27,22 +27,8 @@ isEmpty(CTEST_VERSION) { } CMAKE_VERSION = $$last(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) { - VERSION_OK = 1 -} else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 8) { - VERSION_OK = 1 -} else:greaterThan(CMAKE_VERSION_MAJOR, 1):greaterThan(CMAKE_VERSION_MINOR, 7):greaterThan(CMAKE_VERSION_PATCH, 2) { - VERSION_OK = 1 -} -isEmpty(VERSION_OK) { +!versionAtLeast(CMAKE_VERSION, 2.8.3) { message("cmake $$CMAKE_VERSION is too old for this test.") return() } |