Skip to content

Commit

Permalink
Dont just link to every available qt lib. This resolved issues where …
Browse files Browse the repository at this point in the history
…e.g. QtTest dependecy is being added to each build product unneccesarily.

git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7223 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Sep 27, 2007
1 parent 5060577 commit 5368b8d
Show file tree
Hide file tree
Showing 17 changed files with 16 additions and 19 deletions.
1 change: 0 additions & 1 deletion src/plugins/delimited_text/CMakeLists.txt
Expand Up @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(delimitedtextplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/georeferencer/CMakeLists.txt
Expand Up @@ -53,7 +53,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(georefplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
${GSL_LIBRARIES}
Expand Down
1 change: 0 additions & 1 deletion src/plugins/gps_importer/CMakeLists.txt
Expand Up @@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(gpsimporterplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/grass/CMakeLists.txt
Expand Up @@ -102,7 +102,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(grassplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
qgisgrass
Expand Down
1 change: 0 additions & 1 deletion src/plugins/grid_maker/CMakeLists.txt
Expand Up @@ -49,7 +49,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(gridmakerplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/north_arrow/CMakeLists.txt
Expand Up @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(northarrowplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/plugin_template/CMakeLists.txt
Expand Up @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES([pluginlcasename]plugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
1 change: 0 additions & 1 deletion src/plugins/scale_bar/CMakeLists.txt
Expand Up @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(scalebarplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
2 changes: 0 additions & 2 deletions src/plugins/spit/CMakeLists.txt
Expand Up @@ -63,7 +63,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(spitplugin
${QT_LIBRARIES}
${POSTGRES_LIBRARY}
${GDAL_LIBRARY}
qgis_core
Expand All @@ -75,7 +74,6 @@ IF (PLUGINS_ALSO_BINARIES)
ADD_EXECUTABLE (spit ${SPIT_EXE_SRCS} ${SPIT_EXE_MOC_SRCS} ${SPIT_RCC_SRCS} ${SPIT_UIS_H})

TARGET_LINK_LIBRARIES(spit
${QT_LIBRARIES}
${POSTGRES_LIBRARY}
qgis_core
qgis_gui
Expand Down
1 change: 0 additions & 1 deletion src/plugins/wfs/CMakeLists.txt
Expand Up @@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
)

TARGET_LINK_LIBRARIES(wfsplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)
Expand Down
3 changes: 2 additions & 1 deletion src/providers/delimitedtext/CMakeLists.txt
Expand Up @@ -18,7 +18,8 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS})

TARGET_LINK_LIBRARIES(delimitedtextprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
qgis_core
Expand Down
3 changes: 2 additions & 1 deletion src/providers/gpx/CMakeLists.txt
Expand Up @@ -17,7 +17,8 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY(gpxprovider MODULE ${OGR_SRCS})

TARGET_LINK_LIBRARIES(gpxprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GEOS_LIBRARY}
${EXPAT_LIBRARY}
qgis_core
Expand Down
6 changes: 4 additions & 2 deletions src/providers/grass/CMakeLists.txt
Expand Up @@ -31,15 +31,17 @@ INCLUDE_DIRECTORIES (
ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS})

TARGET_LINK_LIBRARIES (qgisgrass
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GRASS_LIBRARIES}
qgis_core
)

ADD_LIBRARY (grassprovider MODULE ${GRASS_PROVIDER_SRCS})

TARGET_LINK_LIBRARIES (grassprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
qgisgrass
)
Expand Down
3 changes: 2 additions & 1 deletion src/providers/ogr/CMakeLists.txt
Expand Up @@ -11,7 +11,8 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY(ogrprovider MODULE ${OGR_SRCS})

TARGET_LINK_LIBRARIES(ogrprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
qgis_core
Expand Down
3 changes: 2 additions & 1 deletion src/providers/postgres/CMakeLists.txt
Expand Up @@ -27,7 +27,8 @@ INCLUDE_DIRECTORIES (
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_MOC_SRCS})

TARGET_LINK_LIBRARIES (postgresprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${POSTGRES_LIBRARY}
qgis_core
)
Expand Down
3 changes: 2 additions & 1 deletion src/providers/wfs/CMakeLists.txt
Expand Up @@ -27,7 +27,8 @@ INCLUDE_DIRECTORIES (
ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})

TARGET_LINK_LIBRARIES (wfsprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GEOS_LIBRARY}
${EXPAT_LIBRARY}
qgis_core
Expand Down
3 changes: 2 additions & 1 deletion src/providers/wms/CMakeLists.txt
Expand Up @@ -9,7 +9,8 @@ INCLUDE_DIRECTORIES( . ../../core)
ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})

TARGET_LINK_LIBRARIES(wmsprovider
${QT_LIBRARIES}
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
)

Expand Down

0 comments on commit 5368b8d

Please sign in to comment.