diff options
| author | Stephen Kelly <steveire@gmail.com> | 2013-02-19 19:05:55 +0100 |
|---|---|---|
| committer | Stephen Kelly <steveire@gmail.com> | 2013-02-19 19:10:25 +0100 |
| commit | 0fe75b194d598f511e66dbe13a9c30d86d2c2ea4 (patch) | |
| tree | e77ff07b48ba04e20a2676ba8517c2c09f2a8c65 | |
| parent | b3723a0bfefae301282eabd21e3c90f0316cb2a0 (diff) | |
| download | extra-cmake-modules-0fe75b194d598f511e66dbe13a9c30d86d2c2ea4.tar.gz extra-cmake-modules-0fe75b194d598f511e66dbe13a9c30d86d2c2ea4.tar.bz2 | |
GCC 4.1 is not supported by Qt 5.
It is not clear whether the allocator is still 'bad' in more-recent
GCC versions, but let's pretend we know it is.
| -rw-r--r-- | kde-modules/KDECompilerSettings.cmake | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/kde-modules/KDECompilerSettings.cmake b/kde-modules/KDECompilerSettings.cmake index b628e40f..3675453e 100644 --- a/kde-modules/KDECompilerSettings.cmake +++ b/kde-modules/KDECompilerSettings.cmake @@ -338,11 +338,6 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") check_cxx_compiler_flag(-fvisibility=hidden __KDE_HAVE_GCC_VISIBILITY) set( __KDE_HAVE_GCC_VISIBILITY ${__KDE_HAVE_GCC_VISIBILITY} CACHE BOOL "GCC support for hidden visibility") - # CMAKE_CXX_COMPILER_VERSION exists since cmake 2.8.7.20120217 - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.1.0") - set(GCC_IS_NEWER_THAN_4_1 TRUE) - endif() - if(NOT "${CMAKE_CXX_COMPILER_VERSION}" VERSION_LESS "4.2.0") set(GCC_IS_NEWER_THAN_4_2 TRUE) endif() @@ -356,12 +351,10 @@ if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "GNU") endif() set(_GCC_COMPILED_WITH_BAD_ALLOCATOR FALSE) - if (GCC_IS_NEWER_THAN_4_1) - exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) - string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") - endif () + exec_program(${CMAKE_C_COMPILER} ARGS ${CMAKE_C_COMPILER_ARG1} -v OUTPUT_VARIABLE _gcc_alloc_info) + string(REGEX MATCH "(--enable-libstdcxx-allocator=mt)" _GCC_COMPILED_WITH_BAD_ALLOCATOR "${_gcc_alloc_info}") - if (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) + if (__KDE_HAVE_GCC_VISIBILITY AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) # TODO: this variable is not documented and not used anywhere # added by Thiago here http://quickgit.kde.org/index.php?p=kdelibs.git&a=commitdiff&h=6bb4ef06259281d643d410cc4e84cd40bf4cd43f |