File tree 7 files changed +12
-6
lines changed
7 files changed +12
-6
lines changed Original file line number Diff line number Diff line change @@ -265,6 +265,10 @@ FIND_PACKAGE(Qt5Sql REQUIRED)
265
265
INCLUDE ("cmake/modules/ECMQt4To5Porting.cmake" )
266
266
MESSAGE (STATUS "Found Qt version: ${Qt5Core_VERSION_STRING} " )
267
267
268
+ IF (WITH_QTWEBKIT)
269
+ SET (OPTIONAL_QTWEBKIT ${QT_QTWEBKIT_LIBRARY} )
270
+ ENDIF (WITH_QTWEBKIT)
271
+
268
272
IF (WITH_QTMOBILITY)
269
273
FIND_PACKAGE (QtMobility 1.1.0)
270
274
ENDIF (WITH_QTMOBILITY)
Original file line number Diff line number Diff line change @@ -605,7 +605,9 @@ TARGET_LINK_LIBRARIES(qgis_app
605
605
${QWT_LIBRARY}
606
606
${QT_QTSQL_LIBRARY}
607
607
${QT_QTUITOOLS_LIBRARY}
608
- ${QT_QTWEBKIT_LIBRARY}
608
+ ${OPTIONAL_QTWEBKIT}
609
+ #should only be needed for win
610
+ ${QT_QTMAIN_LIBRARY}
609
611
${QWTPOLAR_LIBRARY}
610
612
${GDAL_LIBRARY}
611
613
qgis_core
Original file line number Diff line number Diff line change @@ -1043,7 +1043,7 @@ TARGET_LINK_LIBRARIES(qgis_core
1043
1043
${QT_QTGUI_LIBRARY}
1044
1044
${QT_QTNETWORK_LIBRARY}
1045
1045
${QT_QTSVG_LIBRARY}
1046
- ${QT_QTWEBKIT_LIBRARY }
1046
+ ${OPTIONAL_QTWEBKIT }
1047
1047
${QT_QTSQL_LIBRARY}
1048
1048
${QCA_LIBRARY}
1049
1049
Original file line number Diff line number Diff line change @@ -69,7 +69,7 @@ TARGET_LINK_LIBRARIES(qgis_help
69
69
${QT_QTNETWORK_LIBRARY}
70
70
${QT_QTSVG_LIBRARY}
71
71
${QT_QTXML_LIBRARY}
72
- ${QT_QTWEBKIT_LIBRARY }
72
+ ${OPTIONAL_QTWEBKIT }
73
73
${SQLITE3_LIBRARY}
74
74
)
75
75
Original file line number Diff line number Diff line change @@ -36,7 +36,7 @@ TARGET_LINK_LIBRARIES(qgis_bench
36
36
${QT_QTNETWORK_LIBRARY}
37
37
${QT_QTSVG_LIBRARY}
38
38
${QT_QTXML_LIBRARY}
39
- ${QT_QTWEBKIT_LIBRARY }
39
+ ${OPTIONAL_QTWEBKIT }
40
40
${QT_QTTEST_LIBRARY}
41
41
)
42
42
Original file line number Diff line number Diff line change @@ -106,7 +106,7 @@ MACRO (ADD_QGIS_TEST testname testsrc)
106
106
${QT_QTSVG_LIBRARY}
107
107
${QT_QTTEST_LIBRARY}
108
108
${QT_QTNETWORK_LIBRARY}
109
- ${QT_QTWEBKIT_LIBRARY }
109
+ ${OPTIONAL_QTWEBKIT }
110
110
${PROJ_LIBRARY}
111
111
${GEOS_LIBRARY}
112
112
${GDAL_LIBRARY}
Original file line number Diff line number Diff line change @@ -134,7 +134,7 @@ IF(UNIX AND NOT ANDROID AND CMAKE_BUILD_TYPE MATCHES Debug)
134
134
${QT_QTNETWORK_LIBRARY}
135
135
${QT_QTSVG_LIBRARY}
136
136
${QT_QTXML_LIBRARY}
137
- ${QT_QTWEBKIT_LIBRARY }
137
+ ${OPTIONAL_QTWEBKIT }
138
138
${QT_QTSCRIPT_LIBRARY}
139
139
qgis_core
140
140
)
You can’t perform that action at this time.
0 commit comments