Skip to content

Commit 788322b

Browse files
author
timlinux
committed
Explicit linking to qt libs so that we dont link to unneeded ones e.g. qtest
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7156 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent c07d480 commit 788322b

File tree

2 files changed

+15
-2
lines changed

2 files changed

+15
-2
lines changed

src/core/CMakeLists.txt

+8-1
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,14 @@ IF (WIN32)
144144
ENDIF (WIN32)
145145

146146
TARGET_LINK_LIBRARIES(qgis_core
147-
${QT_LIBRARIES} ${QT_QTSVG_LIBRARY}
147+
${QT_QTCORE_LIBRARY}
148+
${QT_QTGUI_LIBRARY}
149+
${QT_QTXML_LIBRARY}
150+
${QT_QTSQL_LIBRARY}
151+
${QT_QTSVG_LIBRARY}
152+
${QT_QTNETWORK_LIBRARY}
153+
${QT_QTMAIN_LIBRARY}
154+
${QT_QT3SUPPORT_LIBRARY}
148155
${PROJ_LIBRARY}
149156
${SQLITE3_LIBRARY}
150157
${GEOS_LIBRARY}

src/gui/CMakeLists.txt

+7-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,13 @@ ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS})
5959
ADD_DEPENDENCIES(qgis_gui ui)
6060

6161
TARGET_LINK_LIBRARIES(qgis_gui
62-
${QT_LIBRARIES}
62+
${QT_QTGUI_LIBRARY}
63+
${QT_QTXML_LIBRARY}
64+
${QT_QTSQL_LIBRARY}
65+
${QT_QTSVG_LIBRARY}
66+
${QT_QTNETWORK_LIBRARY}
67+
${QT_QTMAIN_LIBRARY}
68+
${QT_QT3SUPPORT_LIBRARY}
6369
${SQLITE3_LIBRARIES}
6470
qgis_core
6571
)

0 commit comments

Comments
 (0)