diff options
author | Stephen Kelly <steveire@gmail.com> | 2013-02-19 19:18:25 +0100 |
---|---|---|
committer | Stephen Kelly <steveire@gmail.com> | 2013-02-19 19:18:25 +0100 |
commit | ca7e45738369e6a0c64fbe86a3622c7886c68d8d (patch) | |
tree | 082595a112567894ab9ed9cb0ce9dfacf2123771 | |
parent | de65c073eec4f099cf4fb12f4f670373efc325b0 (diff) | |
download | extra-cmake-modules-ca7e45738369e6a0c64fbe86a3622c7886c68d8d.tar.gz extra-cmake-modules-ca7e45738369e6a0c64fbe86a3622c7886c68d8d.tar.bz2 |
Remove logic for GCC < 4.2.
Qt 5 does not support it.
-rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index aa3ba003..754a6f21 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -334,17 +334,11 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Woverloaded-virtual") endif() - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") - set(GCC_IS_NEWER_THAN_4_2 TRUE) - endif() - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.3.0") set(GCC_IS_NEWER_THAN_4_3 TRUE) endif() - if (GCC_IS_NEWER_THAN_4_2) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type") - endif() + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type") set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) |