File tree Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Expand file tree Collapse file tree 1 file changed +9
-2
lines changed Original file line number Diff line number Diff line change @@ -5,8 +5,10 @@ SET(COMPLETE_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINO
5
5
SET (RELEASE_NAME "Trunk" )
6
6
SET (PROJECT_VERSION ${COMPLETE_VERSION} )
7
7
PROJECT (qgis${PROJECT_VERSION} )
8
+
8
9
# 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} )" )
10
12
11
13
# TODO:
12
14
# - install includes for libs
@@ -171,7 +173,12 @@ ENDIF (SPATIALITE_FOUND)
171
173
#############################################################
172
174
# search for Qt4
173
175
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 )
175
182
176
183
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 )
177
184
MESSAGE (SEND_ERROR "Some Qt4 modules haven't been found!" )
You can’t perform that action at this time.
0 commit comments