Skip to content

Commit f9a0643

Browse files
a17rm-kuhn
authored andcommitted
Don't link to QtWebKit when it's disabled
1 parent c0a8ee5 commit f9a0643

File tree

7 files changed

+12
-6
lines changed

7 files changed

+12
-6
lines changed

CMakeLists.txt

+4
Original file line numberDiff line numberDiff line change
@@ -265,6 +265,10 @@ FIND_PACKAGE(Qt5Sql REQUIRED)
265265
INCLUDE("cmake/modules/ECMQt4To5Porting.cmake")
266266
MESSAGE(STATUS "Found Qt version: ${Qt5Core_VERSION_STRING}")
267267

268+
IF(WITH_QTWEBKIT)
269+
SET(OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY})
270+
ENDIF(WITH_QTWEBKIT)
271+
268272
IF (WITH_QTMOBILITY)
269273
FIND_PACKAGE(QtMobility 1.1.0)
270274
ENDIF (WITH_QTMOBILITY)

src/app/CMakeLists.txt

+3-1
Original file line numberDiff line numberDiff line change
@@ -605,7 +605,9 @@ TARGET_LINK_LIBRARIES(qgis_app
605605
${QWT_LIBRARY}
606606
${QT_QTSQL_LIBRARY}
607607
${QT_QTUITOOLS_LIBRARY}
608-
${QT_QTWEBKIT_LIBRARY}
608+
${OPTIONAL_QTWEBKIT}
609+
#should only be needed for win
610+
${QT_QTMAIN_LIBRARY}
609611
${QWTPOLAR_LIBRARY}
610612
${GDAL_LIBRARY}
611613
qgis_core

src/core/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ TARGET_LINK_LIBRARIES(qgis_core
10431043
${QT_QTGUI_LIBRARY}
10441044
${QT_QTNETWORK_LIBRARY}
10451045
${QT_QTSVG_LIBRARY}
1046-
${QT_QTWEBKIT_LIBRARY}
1046+
${OPTIONAL_QTWEBKIT}
10471047
${QT_QTSQL_LIBRARY}
10481048
${QCA_LIBRARY}
10491049

src/helpviewer/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ TARGET_LINK_LIBRARIES(qgis_help
6969
${QT_QTNETWORK_LIBRARY}
7070
${QT_QTSVG_LIBRARY}
7171
${QT_QTXML_LIBRARY}
72-
${QT_QTWEBKIT_LIBRARY}
72+
${OPTIONAL_QTWEBKIT}
7373
${SQLITE3_LIBRARY}
7474
)
7575

tests/bench/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
3636
${QT_QTNETWORK_LIBRARY}
3737
${QT_QTSVG_LIBRARY}
3838
${QT_QTXML_LIBRARY}
39-
${QT_QTWEBKIT_LIBRARY}
39+
${OPTIONAL_QTWEBKIT}
4040
${QT_QTTEST_LIBRARY}
4141
)
4242

tests/src/gui/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
106106
${QT_QTSVG_LIBRARY}
107107
${QT_QTTEST_LIBRARY}
108108
${QT_QTNETWORK_LIBRARY}
109-
${QT_QTWEBKIT_LIBRARY}
109+
${OPTIONAL_QTWEBKIT}
110110
${PROJ_LIBRARY}
111111
${GEOS_LIBRARY}
112112
${GDAL_LIBRARY}

tests/src/providers/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
134134
${QT_QTNETWORK_LIBRARY}
135135
${QT_QTSVG_LIBRARY}
136136
${QT_QTXML_LIBRARY}
137-
${QT_QTWEBKIT_LIBRARY}
137+
${OPTIONAL_QTWEBKIT}
138138
${QT_QTSCRIPT_LIBRARY}
139139
qgis_core
140140
)

0 commit comments

Comments
 (0)