Fix QtWebKit automagic

a17r · m-kuhn · commit af73eea36307 · 2017-02-24T11:11:18.000+01:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -288,6 +288,10 @@ ELSE()
   MESSAGE(STATUS "Found Qt version: ${QTVERSION}")
 ENDIF()
 
+IF(WITH_QTWEBKIT)
+    SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY})
+ENDIF(WITH_QTWEBKIT)
+
 IF (WITH_QTMOBILITY)
     FIND_PACKAGE(QtMobility 1.1.0)
 ENDIF (WITH_QTMOBILITY)
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
@@ -609,7 +609,7 @@ TARGET_LINK_LIBRARIES(qgis_app
   ${QWT_LIBRARY}
   ${QT_QTSQL_LIBRARY}
   ${QT_QTUITOOLS_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   #should only be needed for win
   ${QT_QTMAIN_LIBRARY}
   ${QWTPOLAR_LIBRARY}
diff --git a/src/browser/CMakeLists.txt b/src/browser/CMakeLists.txt
@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTXML_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${QT_QTMAIN_LIBRARY}
   ${SQLITE3_LIBRARY}
 )
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -981,7 +981,7 @@ TARGET_LINK_LIBRARIES(qgis_core
   ${QT_QTGUI_LIBRARY}
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${QT_QTSQL_LIBRARY}
   ${QCA_LIBRARY}
 
diff --git a/src/helpviewer/CMakeLists.txt b/src/helpviewer/CMakeLists.txt
@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTXML_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${QT_QTMAIN_LIBRARY}
   ${SQLITE3_LIBRARY}
 )
diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt
@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTXML_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${QT_QTMAIN_LIBRARY}
   ${QT_QTTEST_LIBRARY}
 )
diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -102,7 +102,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
     ${QT_QTSVG_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     ${QT_QTNETWORK_LIBRARY}
-    ${QT_QTWEBKIT_LIBRARY}
+    ${OPTIONAL_QTWEBKIT}
     ${QT_QTMAIN_LIBRARY}
     ${PROJ_LIBRARY}
     ${GEOS_LIBRARY}
diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
@@ -124,7 +124,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
     ${QT_QTNETWORK_LIBRARY}
     ${QT_QTSVG_LIBRARY}
     ${QT_QTXML_LIBRARY}
-    ${QT_QTWEBKIT_LIBRARY}
+    ${OPTIONAL_QTWEBKIT}
     ${QT_QTMAIN_LIBRARY}
     ${QT_QTSCRIPT_LIBRARY}
     qgis_core

Original file line number	Diff line number	Diff line change
`@@ -80,7 +80,7 @@ TARGET_LINK_LIBRARIES(qbrowser`
`80`	`80`	`${QT_QTNETWORK_LIBRARY}`
`81`	`81`	`${QT_QTSVG_LIBRARY}`
`82`	`82`	`${QT_QTXML_LIBRARY}`
`83`		`- ${QT_QTWEBKIT_LIBRARY}`
	`83`	`+ ${OPTIONAL_QTWEBKIT}`
`84`	`84`	`${QT_QTMAIN_LIBRARY}`
`85`	`85`	`${SQLITE3_LIBRARY}`
`86`	`86`	`)`
Original file line number	Diff line number	Diff line change
`@@ -68,7 +68,7 @@ TARGET_LINK_LIBRARIES(qgis_help`
`68`	`68`	`${QT_QTNETWORK_LIBRARY}`
`69`	`69`	`${QT_QTSVG_LIBRARY}`
`70`	`70`	`${QT_QTXML_LIBRARY}`
`71`		`- ${QT_QTWEBKIT_LIBRARY}`
	`71`	`+ ${OPTIONAL_QTWEBKIT}`
`72`	`72`	`${QT_QTMAIN_LIBRARY}`
`73`	`73`	`${SQLITE3_LIBRARY}`
`74`	`74`	`)`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ TARGET_LINK_LIBRARIES(qgis_bench`
`35`	`35`	`${QT_QTNETWORK_LIBRARY}`
`36`	`36`	`${QT_QTSVG_LIBRARY}`
`37`	`37`	`${QT_QTXML_LIBRARY}`
`38`		`- ${QT_QTWEBKIT_LIBRARY}`
	`38`	`+ ${OPTIONAL_QTWEBKIT}`
`39`	`39`	`${QT_QTMAIN_LIBRARY}`
`40`	`40`	`${QT_QTTEST_LIBRARY}`
`41`	`41`	`)`