From ca352dbee966b1f14d9b78bf6d506e7750b391f2 Mon Sep 17 00:00:00 2001 From: "Juergen E. Fischer" Date: Tue, 10 Jan 2012 10:12:14 +0100 Subject: [PATCH] don't require webkit when desktop is not built (refers #4756) --- CMakeLists.txt | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 67b686bac20..b7835616fa8 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -187,13 +187,18 @@ SET(QT_USE_QTXML 1) SET(QT_USE_QTNETWORK 1) SET(QT_USE_QTSVG 1) SET(QT_USE_QTSQL 1) + +IF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND) + MESSAGE(SEND_ERROR "Some Qt4 modules haven't been found!") +ENDIF (NOT QT_QTXML_FOUND OR NOT QT_QTNETWORK_FOUND OR NOT QT_QTSVG_FOUND OR NOT QT_QTSQL_FOUND) + IF(WITH_DESKTOP) SET(QT_USE_QTWEBKIT 1) -ENDIF(WITH_DESKTOP) -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!") -ENDIF () + IF(NOT QT_QTWEBKIT_FOUND) + MESSAGE(SEND_ERROR "Qt Webkit module required for QGIS Desktop!") + ENDIF(NOT QT_QTWEBKIT_FOUND) +ENDIF(WITH_DESKTOP) IF (ENABLE_TESTS) SET( QT_USE_QTTEST TRUE )