[QGIS Commit] r12991 - trunk/qgis

[svn_qgis at osgeo.org]

Author: wonder
Date: 2010-03-02 03:55:54 -0500 (Tue, 02 Mar 2010)
New Revision: 12991

Modified:
   trunk/qgis/CMakeLists.txt
Log:
Make sure the user has Qt 4.4 or better, check whether all necessary Qt modules are present.


Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2010-03-01 22:56:13 UTC (rev 12990)
+++ trunk/qgis/CMakeLists.txt	2010-03-02 08:55:54 UTC (rev 12991)
@@ -170,13 +170,12 @@
 
 #############################################################
 # search for Qt4
-FIND_PACKAGE(Qt4 REQUIRED)
+FIND_PACKAGE(Qt4 4.4 COMPONENTS QtCore QtGui QtXml QtNetwork QtSvg QtSql QtWebKit REQUIRED)
 
-SET( QT_USE_QTXML      TRUE )
-SET( QT_USE_QTNETWORK  TRUE )
-SET( QT_USE_QTSVG      TRUE )
-SET( QT_USE_QTSQL      TRUE )
-SET( QT_USE_QTWEBKIT   TRUE )
+IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND OR NOT QT_QTWEBKIT_FOUND)
+  MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
+ENDIF ()
+
 IF (ENABLE_TESTS)
   SET( QT_USE_QTTEST  TRUE )
   ENABLE_TESTING()