Don't link to QtWebKit when it's disabled

qgis · Feb 24, 2017 · f9a0643 · f9a0643
1 parent c0a8ee5
commit f9a0643
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -265,6 +265,10 @@ FIND_PACKAGE(Qt5Sql REQUIRED)
 INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
 MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
 
+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
@@ -605,7 +605,9 @@ 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}
   ${GDAL_LIBRARY}
   qgis_core

diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
@@ -1043,7 +1043,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
@@ -69,7 +69,7 @@ TARGET_LINK_LIBRARIES(qgis_help
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTXML_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${SQLITE3_LIBRARY}
 )
 

diff --git a/tests/bench/CMakeLists.txt b/tests/bench/CMakeLists.txt
@@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
   ${QT_QTNETWORK_LIBRARY}
   ${QT_QTSVG_LIBRARY}
   ${QT_QTXML_LIBRARY}
-  ${QT_QTWEBKIT_LIBRARY}
+  ${OPTIONAL_QTWEBKIT}
   ${QT_QTTEST_LIBRARY}
 )
 

diff --git a/tests/src/gui/CMakeLists.txt b/tests/src/gui/CMakeLists.txt
@@ -106,7 +106,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
     ${QT_QTSVG_LIBRARY}
     ${QT_QTTEST_LIBRARY}
     ${QT_QTNETWORK_LIBRARY}
-    ${QT_QTWEBKIT_LIBRARY}
+    ${OPTIONAL_QTWEBKIT}
     ${PROJ_LIBRARY}
     ${GEOS_LIBRARY}
     ${GDAL_LIBRARY}

diff --git a/tests/src/providers/CMakeLists.txt b/tests/src/providers/CMakeLists.txt
@@ -134,7 +134,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_QTSCRIPT_LIBRARY}
     qgis_core
   )