[cmake-commits] hoffman committed FindQt4.cmake 1.74 1.75

[cmake-commits at cmake.org]

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

Modified Files:
	FindQt4.cmake 
Log Message:
ENH: set  QT_EDITION_DESKTOPLIGHT and do not disable modules


Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.74
retrieving revision 1.75
diff -u -d -r1.74 -r1.75
--- FindQt4.cmake	27 Sep 2007 00:53:29 -0000	1.74
+++ FindQt4.cmake	27 Sep 2007 18:20:27 -0000	1.75
@@ -61,6 +61,7 @@
 #  QT4_FOUND        If false, don't try to use Qt 4.
 #
 #  QT_EDITION             Set to the edition of Qt (i.e. DesktopLight)
+#  QT_EDITION_DESKTOPLIGHT True if QT_EDITION == DesktopLight
 #  QT_QTCORE_FOUND        True if QtCore was found.
 #  QT_QTGUI_FOUND         True if QtGui was found.
 #  QT_QT3SUPPORT_FOUND    True if Qt3Support was found.
@@ -1091,21 +1092,11 @@
     STRING(REGEX MATCH "CONFIG[^\n]+" QT_CONFIG ${_qconfig_FILE_contents})
     STRING(REGEX MATCH "EDITION[^\n]+" QT_EDITION ${_qconfig_FILE_contents})
   ENDIF(EXISTS "${QT_MKSPECS_DIR}/qconfig.pri")
+  IF("${QT_EDITION}" MATCHES "DesktopLight")
+    SET(QT_EDITION_DESKTOPLIGHT 1)
+  ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
 
-  # desktop light only supports CORE and GUI so disable other
-  # packages even if they are found as they will not work
-  MACRO(QT_DISABLE_UNLICENSED_MODULES modules)
-    IF("${QT_EDITION}" MATCHES "DesktopLight")
-      FOREACH( _module ${modules})
-        SET(QT_${_module}_FOUND FALSE)
-      ENDFOREACH(_module)
-    ENDIF("${QT_EDITION}" MATCHES "DesktopLight")
-  ENDMACRO(QT_DISABLE_UNLICENSED_MODULES)
-  QT_DISABLE_UNLICENSED_MODULES(
-    "QTNETWORK;QTXML;QTSQL;QTOPENGL;QTSVG")
   
-
-
   ###############################################
   #
   #       configuration/system dependent settings