Skip to content

Commit c4cb0d3

Browse files
author
wonder
committed
Make sure the user has Qt 4.4 or better, check whether all necessary Qt modules are present.
git-svn-id: http://svn.osgeo.org/qgis/trunk@12991 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent bfe4e78 commit c4cb0d3

File tree

1 file changed

+5
-6
lines changed

1 file changed

+5
-6
lines changed

CMakeLists.txt

+5-6
Original file line numberDiff line numberDiff line change
@@ -170,13 +170,12 @@ ENDIF (SPATIALITE_FOUND)
170170

171171
#############################################################
172172
# search for Qt4
173-
FIND_PACKAGE(Qt4 REQUIRED)
173+
FIND_PACKAGE(Qt4 4.4 COMPONENTS QtCore QtGui QtXml QtNetwork QtSvg QtSql QtWebKit REQUIRED)
174+
175+
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)
176+
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
177+
ENDIF ()
174178

175-
SET( QT_USE_QTXML TRUE )
176-
SET( QT_USE_QTNETWORK TRUE )
177-
SET( QT_USE_QTSVG TRUE )
178-
SET( QT_USE_QTSQL TRUE )
179-
SET( QT_USE_QTWEBKIT TRUE )
180179
IF (ENABLE_TESTS)
181180
SET( QT_USE_QTTEST TRUE )
182181
ENABLE_TESTING()

0 commit comments

Comments
 (0)