[QGIS Commit] r13008 - trunk/qgis

[svn_qgis at osgeo.org]

Author: jef
Date: 2010-03-05 10:22:21 -0500 (Fri, 05 Mar 2010)
New Revision: 13008

Modified:
   trunk/qgis/CMakeLists.txt
Log:
another fix for Qt with CMake 2.6

Modified: trunk/qgis/CMakeLists.txt
===================================================================
--- trunk/qgis/CMakeLists.txt	2010-03-05 13:07:52 UTC (rev 13007)
+++ trunk/qgis/CMakeLists.txt	2010-03-05 15:22:21 UTC (rev 13008)
@@ -5,8 +5,10 @@
 SET(RELEASE_NAME "Trunk")
 SET(PROJECT_VERSION ${COMPLETE_VERSION})
 PROJECT(qgis${PROJECT_VERSION})
+
 # Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
-SET(QGIS_VERSION_INT 10500)
+MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
+MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
 
 # TODO:
 # - install includes for libs
@@ -171,7 +173,12 @@
 #############################################################
 # search for Qt4
 SET(QT_MIN_VERSION 4.4.0)
-FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} COMPONENTS QtCore QtGui QtXml QtNetwork QtSvg QtSql QtWebKit REQUIRED)
+FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
+SET(QT_USE_QTXML 1)
+SET(QT_USE_QTNETWORK 1)
+SET(QT_USE_QTSVG 1)
+SET(QT_USE_QTSQL 1)
+SET(QT_USE_QTWEBKIT 1)
 
 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!")