aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Neundorf <neundorf@kde.org>2008-11-06 17:28:11 +0000
committerAlexander Neundorf <neundorf@kde.org>2008-11-06 17:28:11 +0000
commita101b5fdebe646d8a68bc365ad25d6e60060b15f (patch)
tree0937c43fe764d96c5cd8285ce72801346fe1039e
parent668d29cd5e4ecd6c95c583066a7e0ea0b93b35f2 (diff)
downloadextra-cmake-modules-a101b5fdebe646d8a68bc365ad25d6e60060b15f.tar.gz
extra-cmake-modules-a101b5fdebe646d8a68bc365ad25d6e60060b15f.tar.bz2
-remove setting CMAKE_CONFIGURATION_TYPES, this is intended only for the non-Makefile generators, but was
set always, and for Makefile-generators only CMAKE_BUILD_TYPE should be set, otherwise you can get strange effects e.g. when installing (then some configuration from CMAKE_CONFIGURATION_TYPES instead of the one from CMAKE_BUILD_TYPE might be installed) See http://lists.kde.org/?l=kde-buildsystem&m=122592542916378&w=2 Alex svn path=/trunk/KDE/kdelibs/; revision=880856
-rw-r--r--modules/FindKDE4Internal.cmake6
1 files changed, 1 insertions, 5 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake
index ea018d02..c1872836 100644
--- a/modules/FindKDE4Internal.cmake
+++ b/modules/FindKDE4Internal.cmake
@@ -202,7 +202,7 @@
#
# A note on the possible values for CMAKE_BUILD_TYPE and how KDE handles
# the flags for those buildtypes. FindKDE4Internal supports the values
-# Debug, Release, Relwithdebinfo, Profile and Debugfull
+# Debug, Release, RelWithDebInfo, Profile and Debugfull
#
# Release
# optimised for speed, qDebug/kDebug turned off, no debug symbols
@@ -1030,8 +1030,6 @@ endif(MSVC)
if (CMAKE_COMPILER_IS_GNUCXX)
- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-
set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
# Select flags.
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")
@@ -1139,8 +1137,6 @@ endif (CMAKE_COMPILER_IS_GNUCXX)
if (CMAKE_C_COMPILER MATCHES "icc")
- set (CMAKE_CONFIGURATION_TYPES ${CMAKE_CONFIGURATION_TYPES} "Debugfull")
-
set (KDE4_ENABLE_EXCEPTIONS -fexceptions)
# Select flags.
set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "-O2 -g")