diff options
| author | Dirk Mueller <mueller@kde.org> | 2011-05-21 02:52:14 +0200 |
|---|---|---|
| committer | Dirk Mueller <mueller@kde.org> | 2011-05-21 02:53:59 +0200 |
| commit | b55e7edb2781f8ec7bf179431e0bb7df860db024 (patch) | |
| tree | 700097a3a18fe81e85542d1dfc35a401210ed5cc | |
| parent | 93d1e0b2ca4536e55170a1465a4ef0a63b7b285f (diff) | |
| download | extra-cmake-modules-b55e7edb2781f8ec7bf179431e0bb7df860db024.tar.gz extra-cmake-modules-b55e7edb2781f8ec7bf179431e0bb7df860db024.tar.bz2 | |
make KDE build with a compiler older than 4.2 again
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index cf221a55..7960061b 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -1210,7 +1210,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) if (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) set ( CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-long-long -std=iso9899:1990 -Wundef -Wcast-align -Werror-implicit-function-declaration -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-common") # As off Qt 4.6.x we need to override the new exception macros if we want compile with -fno-exceptions - set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common -Werror=return-type") + set ( CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wnon-virtual-dtor -Wno-long-long -ansi -Wundef -Wcast-align -Wchar-subscripts -Wall -W -Wpointer-arith -Wformat-security -fno-exceptions -DQT_NO_EXCEPTIONS -fno-check-new -fno-common") add_definitions (-D_BSD_SOURCE) endif (CMAKE_SYSTEM_NAME MATCHES Linux OR CMAKE_SYSTEM_NAME STREQUAL GNU) @@ -1292,7 +1292,7 @@ if (CMAKE_COMPILER_IS_GNUCXX) endif(NOT _compile_result) if (GCC_IS_NEWER_THAN_4_2) - set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fvisibility-inlines-hidden") + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror=return-type -fvisibility-inlines-hidden") endif (GCC_IS_NEWER_THAN_4_2) else (__KDE_HAVE_GCC_VISIBILITY AND GCC_IS_NEWER_THAN_4_1 AND NOT _GCC_COMPILED_WITH_BAD_ALLOCATOR AND NOT WIN32) set (__KDE_HAVE_GCC_VISIBILITY 0) |