Dont just link to every available qt lib. This resolved issues where …

…e.g. QtTest dependecy is being added to each build product unneccesarily. git-svn-id: http://svn.osgeo.org/qgis/trunk@7223 c8812cc2-4d05-0410-92ff-de0c093fc19c
qgis · Sep 27, 2007 · 74b56d3 · 74b56d3
1 parent b09e807
commit 74b56d3
Show file tree

Hide file tree

Showing 17 changed files with 16 additions and 19 deletions.
diff --git a/src/plugins/delimited_text/CMakeLists.txt b/src/plugins/delimited_text/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(delimitedtextplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt
@@ -53,7 +53,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(georefplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
   ${GSL_LIBRARIES}

diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt
@@ -45,7 +45,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(gpsimporterplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/grass/CMakeLists.txt b/src/plugins/grass/CMakeLists.txt
@@ -102,7 +102,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(grassplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
   qgisgrass

diff --git a/src/plugins/grid_maker/CMakeLists.txt b/src/plugins/grid_maker/CMakeLists.txt
@@ -49,7 +49,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(gridmakerplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/north_arrow/CMakeLists.txt b/src/plugins/north_arrow/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(northarrowplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/plugin_template/CMakeLists.txt b/src/plugins/plugin_template/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES([pluginlcasename]plugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/scale_bar/CMakeLists.txt b/src/plugins/scale_bar/CMakeLists.txt
@@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(scalebarplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/plugins/spit/CMakeLists.txt b/src/plugins/spit/CMakeLists.txt
@@ -63,7 +63,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(spitplugin
-  ${QT_LIBRARIES}
   ${POSTGRES_LIBRARY}
   ${GDAL_LIBRARY}
   qgis_core
@@ -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

diff --git a/src/plugins/wfs/CMakeLists.txt b/src/plugins/wfs/CMakeLists.txt
@@ -41,7 +41,6 @@ INCLUDE_DIRECTORIES(
 )
 
 TARGET_LINK_LIBRARIES(wfsplugin
-  ${QT_LIBRARIES}
   qgis_core
   qgis_gui
 )

diff --git a/src/providers/delimitedtext/CMakeLists.txt b/src/providers/delimitedtext/CMakeLists.txt
@@ -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

diff --git a/src/providers/gpx/CMakeLists.txt b/src/providers/gpx/CMakeLists.txt
@@ -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

diff --git a/src/providers/grass/CMakeLists.txt b/src/providers/grass/CMakeLists.txt
@@ -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
 )

diff --git a/src/providers/ogr/CMakeLists.txt b/src/providers/ogr/CMakeLists.txt
@@ -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

diff --git a/src/providers/postgres/CMakeLists.txt b/src/providers/postgres/CMakeLists.txt
@@ -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
 )

diff --git a/src/providers/wfs/CMakeLists.txt b/src/providers/wfs/CMakeLists.txt
@@ -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

diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt
@@ -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
 )