[cmake-commits] clinton committed UseQt4.cmake 1.11 1.12

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv10188

Modified Files:
	UseQt4.cmake 
Log Message:
ENH:  Define QT_NO_DEBUG when building with release Qt libs.
      Fixes #6104.


Index: UseQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/UseQt4.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- UseQt4.cmake	21 Aug 2007 20:51:30 -0000	1.11
+++ UseQt4.cmake	1 Dec 2007 00:11:18 -0000	1.12
@@ -6,6 +6,17 @@
 
 ADD_DEFINITIONS(${QT_DEFINITIONS})
 
+# 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_DIRECTORIES(${QT_INCLUDE_DIR})
 
 SET(QT_LIBRARIES "")