diff options
| author | Stephen Kelly <stephen.kelly@kdab.com> | 2012-08-02 10:07:19 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-08-10 21:57:47 +0200 |
| commit | 79a7e6f23b9412d281f2c4957be39b656f78fe1e (patch) | |
| tree | c443f31b6c86811f88d2eddbec8cc79a0bbbc489 /tests/auto/cmake | |
| parent | 06ca4e38cf52e5c5ddad8497fa72d2d28d81b2a9 (diff) | |
Require CMake 2.8.9 for the qt5_use_modules function.
The newer CMake version has the POSITION_INDEPENDENT_CODE property which is
what we need here. The CMake 2.8.8 implementation uses awkward and incomplete
string manipulation which I don't want to maintain for any amount of time
when Qt 5.0 is released.
Change-Id: If7ace9c6925ccdbf800f1863fa2368e55fa44d7f
Reviewed-by: Brad King <brad.king@kitware.com>
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'tests/auto/cmake')
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/tests/auto/cmake/CMakeLists.txt b/tests/auto/cmake/CMakeLists.txt index d9eb683f1b..99150f2f55 100644 --- a/tests/auto/cmake/CMakeLists.txt +++ b/tests/auto/cmake/CMakeLists.txt @@ -47,11 +47,12 @@ find_package(Qt5Core REQUIRED) include("${_Qt5CTestMacros}") -if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.8) +if(NOT ${CMAKE_VERSION} VERSION_LESS 2.8.9) # Requires INCLUDE_DIRECTORIES target property in CMake 2.8.8 + # and POSITION_INDEPENDENT_CODE target property in 2.8.9 expect_pass(test_use_modules_function) else() - message("CMake version older than 2.8.8 (Found ${CMAKE_VERSION}). Not running test \"test_use_modules_function\"") + message("CMake version older than 2.8.9 (Found ${CMAKE_VERSION}). Not running test \"test_use_modules_function\"") endif() expect_pass(test_wrap_cpp_and_resources) expect_pass(test_dependent_modules) |