diff options
| -rw-r--r-- | src/corelib/Qt5CoreMacros.cmake | 15 | ||||
| -rw-r--r-- | tests/auto/cmake/CMakeLists.txt | 5 |
2 files changed, 4 insertions, 16 deletions
diff --git a/src/corelib/Qt5CoreMacros.cmake b/src/corelib/Qt5CoreMacros.cmake index 7cccefd014..608c9be6b9 100644 --- a/src/corelib/Qt5CoreMacros.cmake +++ b/src/corelib/Qt5CoreMacros.cmake @@ -212,7 +212,7 @@ function(QT5_ADD_RESOURCES outfiles ) endfunction() -if (NOT CMAKE_VERSION VERSION_LESS 2.8.8) +if (NOT CMAKE_VERSION VERSION_LESS 2.8.9) function(qt5_use_modules _target _link_type) if ("${_link_type}" STREQUAL "LINK_PUBLIC" OR "${_link_type}" STREQUAL "LINK_PRIVATE" ) set(modules ${ARGN}) @@ -233,19 +233,6 @@ if (NOT CMAKE_VERSION VERSION_LESS 2.8.8) if (Qt5_POSITION_INDEPENDENT_CODE) set_property(TARGET ${_target} PROPERTY POSITION_INDEPENDENT_CODE ${Qt5_POSITION_INDEPENDENT_CODE}) - if (CMAKE_VERSION VERSION_LESS 2.8.9) - # We can't just append to the COMPILE_FLAGS property. That creats a ';' separated list - # which breaks the compile commmand line. - # Ensure non-duplication here manually instead. - get_property(_target_type TARGET ${_target} PROPERTY TYPE) - if ("${_target_type}" STREQUAL "EXECUTABLE" AND Qt5${_module}_EXECUTABLE_COMPILE_FLAGS) - get_target_property(_flags ${_target} COMPILE_FLAGS) - string(FIND "${_flags}" "${Qt5${_module}_EXECUTABLE_COMPILE_FLAGS}" _find_result) - if (NOT _find_result) - set_target_properties(${_target} PROPERTIES COMPILE_FLAGS "${_flags} ${Qt5${_module}_EXECUTABLE_COMPILE_FLAGS}") - endif() - endif() - endif() endif() endforeach() endfunction() 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) |