diff options
| -rw-r--r-- | modules/FindKDE4Internal.cmake | 15 | ||||
| -rw-r--r-- | modules/FindQt4.cmake | 11 |
2 files changed, 11 insertions, 15 deletions
diff --git a/modules/FindKDE4Internal.cmake b/modules/FindKDE4Internal.cmake index a840ed95..011d657a 100644 --- a/modules/FindKDE4Internal.cmake +++ b/modules/FindKDE4Internal.cmake @@ -704,21 +704,6 @@ if (WIN32) set(CMAKE_MSVCIDE_RUN_PATH "${PERL_PATH_WINDOWS}\;${QT_BIN_DIR_WINDOWS}" CACHE STATIC "MSVC IDE Run path" FORCE) endif(MSVC_IDE) - - # christian: - # don't know where to add this -> FindQt4.cmake is only executed once and - # because somehow those values are not saved in the cache, I have to set them - # new on every cmake run - # http://www.cmake.org/pipermail/cmake/2007-November/017541.html - # set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} -DQT_DEBUG") - STRING(TOLOWER ${CMAKE_BUILD_TYPE} CMAKE_BUILD_TYPE_TOLOWER) - IF(NOT CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - set(_KDE4_PLATFORM_DEFINITIONS "${_KDE4_PLATFORM_DEFINITIONS} -DQT_NO_DEBUG") - endif (NOT CMAKE_BUILD_TYPE_TOLOWER MATCHES debug) - #set(CMAKE_CXX_FLAGS_MINSIZEREL "${CMAKE_CXX_FLAGS_MINSIZEREL} -DQT_NO_DEBUG" CACHE STRING "overwrite" FORCE) - #set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -DQT_NO_DEBUG" CACHE STRING "overwrite" FORCE) - #set(CMAKE_CXX_FLAGS_RELWITHDEBINFO "${CMAKE_CXX_FLAGS_RELWITHDEBINFO} -DQT_NO_DEBUG" CACHE STRING "overwrite" FORCE) - endif (WIN32) diff --git a/modules/FindQt4.cmake b/modules/FindQt4.cmake index 03f9af27..608f3e86 100644 --- a/modules/FindQt4.cmake +++ b/modules/FindQt4.cmake @@ -186,6 +186,17 @@ if (QT4_QMAKE_FOUND) else (QT4_QMAKE_FOUND) +# check that QT_NO_DEBUG is defined for release configurations +MACRO(QT_CHECK_FLAG_EXISTS FLAG VAR DOC) + IF(NOT ${VAR} MATCHES "${FLAG}") + SET(${VAR} "${${VAR}} ${FLAG}" + CACHE STRING "Flags used by the compiler during ${DOC} builds." FORCE) + ENDIF(NOT ${VAR} MATCHES "${FLAG}") +ENDMACRO(QT_CHECK_FLAG_EXISTS FLAG VAR) +QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELWITHDEBINFO "Release with Debug Info") +QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_RELEASE "release") +QT_CHECK_FLAG_EXISTS(-DQT_NO_DEBUG CMAKE_CXX_FLAGS_MINSIZEREL "release minsize") + INCLUDE(CheckSymbolExists) INCLUDE(MacroAddFileDependencies) INCLUDE(MacroPushRequiredVars) |