From ca7e45738369e6a0c64fbe86a3622c7886c68d8d Mon Sep 17 00:00:00 2001 From: Stephen Kelly Date: Tue, 19 Feb 2013 19:18:25 +0100 Subject: Remove logic for GCC < 4.2. Qt 5 does not support it. --- kde-modules/KDECompilerSettings.cmake | 8 +------- 1 file changed, 1 insertion(+), 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) -- cgit v1.2.1