aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorHelio Castro <helio@kde.org>2009-09-01 16:06:37 +0000
committerHelio Castro <helio@kde.org>2009-09-01 16:06:37 +0000
commit523f2823fe33dcb1da0ce0e5d4349693416893cf (patch)
treef7345a3253433d324a294c764877a65cad8c6375 /modules
parent567b97273ad4f922c8b9e7a2a00595a679d082f6 (diff)
downloadextra-cmake-modules-523f2823fe33dcb1da0ce0e5d4349693416893cf.tar.gz
extra-cmake-modules-523f2823fe33dcb1da0ce0e5d4349693416893cf.tar.bz2
As of Qt 4.6.x, we need explicetly add macro in case of use -fno-exceptions
svn path=/trunk/KDE/kdelibs/; revision=1018365
Diffstat (limited to 'modules')
-rw-r--r--modules/FindKDE4Internal.cmake5
1 files changed, 3 insertions, 2 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index 3c7c1de4..2e1006c8 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -1021,8 +1021,9 @@ if (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_SYSTEM_NAME MATCHES Linux)
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")
- 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 -fno-check-new -fno-common")
- add_definitions (-D_BSD_SOURCE)
+ # 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")
+ add_definitions (-D_BSD_SOURCE)
endif (CMAKE_SYSTEM_NAME MATCHES Linux)
# gcc under Windows