Skip to content

Commit 82a9fa1

Browse files
author
jef
committed
another fix for Qt with CMake 2.6
git-svn-id: http://svn.osgeo.org/qgis/trunk@13008 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent a0e2f63 commit 82a9fa1

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

CMakeLists.txt

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,10 @@ SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINO
55
SET(RELEASE_NAME "Trunk")
66
SET(PROJECT_VERSION ${COMPLETE_VERSION})
77
PROJECT(qgis${PROJECT_VERSION})
8+
89
# Note the version no is Mmmpp for Major/minor/patch, 0-padded, thus '10100' for 1.1.0
9-
SET(QGIS_VERSION_INT 10500)
10+
MATH(EXPR QGIS_VERSION_INT "${CPACK_PACKAGE_VERSION_MAJOR}*10000+${CPACK_PACKAGE_VERSION_MINOR}*100+${CPACK_PACKAGE_VERSION_PATCH}")
11+
MESSAGE(STATUS "Quantum GIS version: ${COMPLETE_VERSION} ${RELEASE_NAME} (${QGIS_VERSION_INT})")
1012

1113
# TODO:
1214
# - install includes for libs
@@ -171,7 +173,12 @@ ENDIF (SPATIALITE_FOUND)
171173
#############################################################
172174
# search for Qt4
173175
SET(QT_MIN_VERSION 4.4.0)
174-
FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} COMPONENTS QtCore QtGui QtXml QtNetwork QtSvg QtSql QtWebKit REQUIRED)
176+
FIND_PACKAGE(Qt4 ${QT_MIN_VERSION} REQUIRED)
177+
SET(QT_USE_QTXML 1)
178+
SET(QT_USE_QTNETWORK 1)
179+
SET(QT_USE_QTSVG 1)
180+
SET(QT_USE_QTSQL 1)
181+
SET(QT_USE_QTWEBKIT 1)
175182

176183
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)
177184
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")

0 commit comments

Comments
 (0)