summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorMaciej Mrozowski <reavertm@gmail.com>2010-05-27 17:31:00 +0200
committerPino Toscano <pino@kde.org>2010-05-28 00:36:57 +0200
commit87128ab0dfec6be1a034361512ee41301b078831 (patch)
treee2c7cfcbdf6fb90109ba8696922ab86fd7250d75 /cmake
parent241c338facb45641ef1a271c904355a014bbf28d (diff)
[CMake] Do not force -O2, preserve compiler flags instead.
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/PopplerMacros.cmake4
1 files changed, 2 insertions, 2 deletions
diff --git a/cmake/modules/PopplerMacros.cmake b/cmake/modules/PopplerMacros.cmake
index e6b1efcf..9b4ae132 100644
--- a/cmake/modules/PopplerMacros.cmake
+++ b/cmake/modules/PopplerMacros.cmake
@@ -102,9 +102,9 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# set the default compile warnings
set(DEFAULT_COMPILE_WARNINGS_NO)
set(DEFAULT_COMPILE_WARNINGS_YES "-Wall -Wno-write-strings")
- set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -O2 -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
+ set(DEFAULT_COMPILE_WARNINGS_KDE "-Wno-long-long -Wundef -D_XOPEN_SOURCE=600 -D_BSD_SOURCE -Wcast-align -Wconversion -Wchar-subscripts -Wall -W -Wpointer-arith -Wwrite-strings -Wformat-security -Wmissing-format-attribute -fno-exceptions -fno-check-new -fno-common")
- set(CMAKE_CXX_FLAGS "-Wnon-virtual-dtor -Woverloaded-virtual")
+ set(CMAKE_CXX_FLAGS "-Wnon-virtual-dtor -Woverloaded-virtual ${CMAKE_CXX_FLAGS}")
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-g -O2 -fno-reorder-blocks -fno-schedule-insns -fno-inline")