diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-03-16 19:50:10 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-03-16 19:50:10 +0100 |
| commit | e70cc1dacedb2fbe8aae581625b7ce75e7902f6c (patch) | |
| tree | b07162a875b7202b989a942bb076b185c0c054eb | |
| parent | a783caa80626b8cd5d90db1f9c0b560dc9310c38 (diff) | |
| download | extra-cmake-modules-e70cc1dacedb2fbe8aae581625b7ce75e7902f6c.tar.gz extra-cmake-modules-e70cc1dacedb2fbe8aae581625b7ce75e7902f6c.tar.bz2 | |
Remove some settings which are no longer needed with CMake 2.8.11.
| -rw-r--r-- | find-modules/FindQt5Transitional.cmake | 5 | ||||
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 5 |
2 files changed, 0 insertions, 10 deletions
diff --git a/find-modules/FindQt5Transitional.cmake b/find-modules/FindQt5Transitional.cmake index 7d7f78fc..55306b48 100644 --- a/find-modules/FindQt5Transitional.cmake +++ b/find-modules/FindQt5Transitional.cmake @@ -92,11 +92,6 @@ if (Qt5Core_FOUND) get_filename_component(_modules_dir "${CMAKE_CURRENT_LIST_DIR}/../modules" ABSOLUTE) include("${_modules_dir}/ECMQt4To5Porting.cmake") # TODO: Port away from this. - include_directories(${QT_INCLUDES}) # TODO: Port away from this. - - if (Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE ON) - endif() else() foreach(_component ${Qt5Transitional_FIND_COMPONENTS}) diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index 79ca966e..e72b047b 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -327,11 +327,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_MODULE_LINKER_FLAGS} -Wl,--export-all-symbols") endif () - # TODO : with CMake 2.8.11 this can be removed, it will work automatically - if(Qt5_POSITION_INDEPENDENT_CODE) - set(CMAKE_POSITION_INDEPENDENT_CODE TRUE) - endif() - check_cxx_compiler_flag(-Woverloaded-virtual __KDE_HAVE_W_OVERLOADED_VIRTUAL) if(__KDE_HAVE_W_OVERLOADED_VIRTUAL) set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") |