Skip to content

Commit ca352db

Browse files
committedJan 10, 2012
don't require webkit when desktop is not built (refers #4756)
1 parent 6f9299c commit ca352db

File tree

1 file changed

+9
-4
lines changed

1 file changed

+9
-4
lines changed
 

‎CMakeLists.txt

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -187,13 +187,18 @@ SET(QT_USE_QTXML 1)
187187
SET(QT_USE_QTNETWORK 1)
188188
SET(QT_USE_QTSVG 1)
189189
SET(QT_USE_QTSQL 1)
190+
191+
IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
192+
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
193+
ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND)
194+
190195
IF(WITH_DESKTOP)
191196
SET(QT_USE_QTWEBKIT 1)
192-
ENDIF(WITH_DESKTOP)
193197

194-
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)
195-
MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!")
196-
ENDIF ()
198+
IF(NOT QT_QTWEBKIT_FOUND)
199+
MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!")
200+
ENDIF(NOT QT_QTWEBKIT_FOUND)
201+
ENDIF(WITH_DESKTOP)
197202

198203
IF (ENABLE_TESTS)
199204
SET( QT_USE_QTTEST TRUE )

0 commit comments

Comments
 (0)
Please sign in to comment.