Skip to content

Commit 7930ada

Browse files
author
jef
committedNov 28, 2009
remove unnecessary linkages
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@12273 c8812cc2-4d05-0410-92ff-de0c093fc19c
·
final-1_7_1final-1_7_0
1 parent 12a1bbf commit 7930ada

File tree

23 files changed

+103
-205
lines changed

23 files changed

+103
-205
lines changed
 

‎cmake/FindGRASS.cmake

Lines changed: 9 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -5,36 +5,33 @@ MACRO (CHECK_GRASS G_PREFIX)
55

66
FIND_PATH (GRASS_INCLUDE_DIR grass/version.h ${G_PREFIX}/include)
77

8+
SET (GRASS_LIBRARIES_FOUND TRUE)
89
SET (GRASS_LIB_NAMES gis vect dig2 dbmiclient dbmibase shape dgl rtree datetime linkm form gproj)
910

10-
SET (GRASS_LIBRARIES "")
11-
1211
FOREACH (LIB ${GRASS_LIB_NAMES})
12+
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
13+
1314
SET(LIB_PATH NOTFOUND)
1415
FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
1516

1617
IF (LIB_PATH)
17-
IF (NOT GRASS_LIBRARIES STREQUAL NOTFOUND)
18-
SET (GRASS_LIBRARIES ${GRASS_LIBRARIES} ${LIB_PATH})
19-
ENDIF (NOT GRASS_LIBRARIES STREQUAL NOTFOUND)
18+
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})
2019
ELSE (LIB_PATH)
21-
SET (GRASS_LIBRARIES NOTFOUND)
20+
SET (GRASS_LIBRARY_${LIB} NOTFOUND)
21+
SET (GRASS_LIBRARIES_FOUND FALSE)
2222
ENDIF (LIB_PATH)
2323

2424
ENDFOREACH (LIB)
2525

2626
# LIB_PATH is only temporary variable, so hide it (is it possible to delete a variable?)
2727
MARK_AS_ADVANCED(LIB_PATH)
2828

29-
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
29+
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
3030
SET (GRASS_FOUND TRUE)
3131
SET (GRASS_PREFIX ${G_PREFIX})
32-
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
32+
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
3333

34-
MARK_AS_ADVANCED (
35-
GRASS_INCLUDE_DIR
36-
GRASS_LIBRARIES
37-
)
34+
MARK_AS_ADVANCED ( GRASS_INCLUDE_DIR )
3835

3936
ENDMACRO (CHECK_GRASS)
4037

@@ -80,22 +77,6 @@ IF (GRASS_FOUND)
8077
MESSAGE(STATUS "Found GRASS: ${GRASS_PREFIX} (${GRASS_VERSION})")
8178
ENDIF (NOT GRASS_FIND_QUIETLY)
8279

83-
# openpty is currently needed for GRASS shell
84-
INCLUDE(CheckFunctionExists)
85-
IF (APPLE)
86-
SET (CMAKE_REQUIRED_INCLUDES util.h)
87-
ELSE (APPLE)
88-
SET (CMAKE_REQUIRED_INCLUDES pty.h)
89-
SET (CMAKE_REQUIRED_LIBRARIES util)
90-
ENDIF (APPLE)
91-
CHECK_FUNCTION_EXISTS(openpty HAVE_OPENPTY)
92-
93-
# add 'util' library to the dependencies
94-
IF (HAVE_OPENPTY AND NOT APPLE)
95-
FIND_LIBRARY(OPENPTY_LIBRARY NAMES util PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
96-
SET (GRASS_LIBRARIES ${GRASS_LIBRARIES} ${OPENPTY_LIBRARY})
97-
ENDIF (HAVE_OPENPTY AND NOT APPLE)
98-
9980
ELSE (GRASS_FOUND)
10081

10182
IF (WITH_GRASS)

‎python/configure.py.in

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ else:
3737
if not os.path.isdir("./core"):
3838
os.mkdir("./core")
3939
if not os.path.isdir("./gui"):
40-
os.mkdir("./gui")
40+
os.mkdir("./gui")
4141
if not os.path.isdir("./analysis"):
42-
os.mkdir("./analysis")
42+
os.mkdir("./analysis")
4343

4444
##########################################################################
4545
# SIP -> *.CPP + *.H

‎src/analysis/CMakeLists.txt

Lines changed: 0 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -69,24 +69,8 @@ ADD_DEPENDENCIES(qgis_analysis qgis_core)
6969

7070
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
7171

72-
# because of htonl
73-
IF (WIN32)
74-
SET(PLATFORM_LIBRARIES wsock32)
75-
IF (MSVC)
76-
#needed for linking to gdal which needs odbc
77-
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
78-
ENDIF (MSVC)
79-
ENDIF (WIN32)
80-
8172
TARGET_LINK_LIBRARIES(qgis_analysis
8273
qgis_core
83-
${QT_QTCORE_LIBRARY}
84-
${QT_QTGUI_LIBRARY}
85-
${QT_QTMAIN_LIBRARY}
86-
${PROJ_LIBRARY}
87-
${GEOS_LIBRARY}
88-
${GDAL_LIBRARY}
89-
${PLATFORM_LIBRARIES}
9074
)
9175

9276
IF (APPLE)

‎src/app/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -298,18 +298,13 @@ ELSE (WIN32)
298298
ENDIF (WIN32)
299299

300300
TARGET_LINK_LIBRARIES(qgis
301-
${QT_QTCORE_LIBRARY}
302-
${QT_QTGUI_LIBRARY}
303-
${QT_QTXML_LIBRARY}
304-
${QT_QTSVG_LIBRARY}
305-
${QT_QTNETWORK_LIBRARY}
306301
${QT_QTSQL_LIBRARY}
307302
${QT_QTUITOOLS_LIBRARY}
308303
#should only be needed for win
309304
${QT_QTMAIN_LIBRARY}
310305
qgis_core
311306
qgis_gui
312-
)
307+
)
313308

314309
IF(NOT WITH_INTERNAL_SPATIALITE)
315310
TARGET_LINK_LIBRARIES(qgis ${SQLITE_LIBRARY})

‎src/core/CMakeLists.txt

Lines changed: 81 additions & 81 deletions
Original file line numberDiff line numberDiff line change
@@ -279,24 +279,24 @@ ADD_DEPENDENCIES(qgis_core svnversion)
279279

280280
# because of htonl
281281
IF (WIN32)
282-
SET(PLATFORM_LIBRARIES wsock32)
282+
TARGET_LINK_LIBRARIES(qgis_core wsock32)
283283
IF (MSVC)
284-
#needed for linking to gdal which needs odbc
285-
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
284+
# needed for linking to gdal which needs odbc
285+
# TARGET_LINK_LIBRARIES(qgis_core odbc32 odbccp32)
286286
ENDIF (MSVC)
287287
ENDIF (WIN32)
288288

289289
TARGET_LINK_LIBRARIES(qgis_core
290+
${QT_QTMAIN_LIBRARY}
291+
${QT_QTXML_LIBRARY}
290292
${QT_QTCORE_LIBRARY}
291293
${QT_QTGUI_LIBRARY}
292-
${QT_QTXML_LIBRARY}
293-
${QT_QTSVG_LIBRARY}
294294
${QT_QTNETWORK_LIBRARY}
295-
${QT_QTMAIN_LIBRARY}
295+
${QT_QTSVG_LIBRARY}
296+
296297
${PROJ_LIBRARY}
297298
${GEOS_LIBRARY}
298299
${GDAL_LIBRARY}
299-
${PLATFORM_LIBRARIES}
300300
)
301301

302302
IF (WITH_INTERNAL_SPATIALITE)
@@ -323,82 +323,82 @@ INSTALL(TARGETS qgis_core
323323
# Added by Tim to install headers
324324

325325
SET(QGIS_CORE_HDRS
326-
qgis.h
327-
qgsapplication.h
328-
qgsattributeaction.h
329-
qgscentralpointpositionmanager.h
330-
qgsclipper.h
331-
qgscontexthelp.h
332-
qgscoordinatetransform.h
333-
qgsdatasourceuri.h
334-
qgsdistancearea.h
335-
qgscsexception.h
336-
qgsexception.h
337-
qgsfeature.h
338-
qgsfield.h
339-
qgsgeometry.h
340-
qgshttptransaction.h
341-
qgslabel.h
342-
qgslabelattributes.h
343-
qgslogger.h
344-
qgsmaplayer.h
345-
qgsmaplayerregistry.h
346-
qgsmaprenderer.h
347-
qgsmaptopixel.h
348-
qgsmessageoutput.h
349-
qgsoverlayobjectpositionmanager.h
350-
qgspalobjectpositionmanager.h
351-
qgspoint.h
352-
qgsproject.h
353-
qgsprojectfiletransform.h
354-
qgsprojectproperty.h
355-
qgsprojectversion.h
356-
qgsprovidercountcalcevent.h
357-
qgsproviderextentcalcevent.h
358-
qgsprovidermetadata.h
359-
qgsproviderregistry.h
360-
qgsrasterdataprovider.h
361-
qgsrectangle.h
362-
qgsrendercontext.h
363-
qgsrunprocess.h
364-
qgsscalecalculator.h
365-
qgssearchstring.h
366-
qgssearchtreenode.h
367-
qgssnapper.h
368-
qgscoordinatereferencesystem.h
369-
qgsvectordataprovider.h
370-
qgsvectorfilewriter.h
371-
qgsvectorlayer.h
372-
qgsvectoroverlay.h
373-
qgstolerance.h
374-
375-
raster/qgscliptominmaxenhancement.h
376-
raster/qgscolorrampshader.h
377-
raster/qgscolorrampshader.h
378-
raster/qgscontrastenhancement.h
379-
raster/qgscontrastenhancementfunction.h
380-
raster/qgsfreakoutshader.h
381-
raster/qgslinearminmaxenhancement.h
382-
raster/qgslinearminmaxenhancementwithclip.h
383-
raster/qgspseudocolorshader.h
384-
raster/qgsrasterbandstats.h
385-
raster/qgsrasterlayer.h
386-
raster/qgsrastertransparency.h
387-
raster/qgsrastershader.h
388-
raster/qgsrastershaderfunction.h
389-
raster/qgsrasterviewport.h
390-
391-
renderer/qgscontinuouscolorrenderer.h
392-
renderer/qgsgraduatedsymbolrenderer.h
393-
renderer/qgsrenderer.h
394-
renderer/qgssinglesymbolrenderer.h
395-
renderer/qgsuniquevaluerenderer.h
326+
qgis.h
327+
qgsapplication.h
328+
qgsattributeaction.h
329+
qgscentralpointpositionmanager.h
330+
qgsclipper.h
331+
qgscontexthelp.h
332+
qgscoordinatetransform.h
333+
qgsdatasourceuri.h
334+
qgsdistancearea.h
335+
qgscsexception.h
336+
qgsexception.h
337+
qgsfeature.h
338+
qgsfield.h
339+
qgsgeometry.h
340+
qgshttptransaction.h
341+
qgslabel.h
342+
qgslabelattributes.h
343+
qgslogger.h
344+
qgsmaplayer.h
345+
qgsmaplayerregistry.h
346+
qgsmaprenderer.h
347+
qgsmaptopixel.h
348+
qgsmessageoutput.h
349+
qgsoverlayobjectpositionmanager.h
350+
qgspalobjectpositionmanager.h
351+
qgspoint.h
352+
qgsproject.h
353+
qgsprojectfiletransform.h
354+
qgsprojectproperty.h
355+
qgsprojectversion.h
356+
qgsprovidercountcalcevent.h
357+
qgsproviderextentcalcevent.h
358+
qgsprovidermetadata.h
359+
qgsproviderregistry.h
360+
qgsrasterdataprovider.h
361+
qgsrectangle.h
362+
qgsrendercontext.h
363+
qgsrunprocess.h
364+
qgsscalecalculator.h
365+
qgssearchstring.h
366+
qgssearchtreenode.h
367+
qgssnapper.h
368+
qgscoordinatereferencesystem.h
369+
qgsvectordataprovider.h
370+
qgsvectorfilewriter.h
371+
qgsvectorlayer.h
372+
qgsvectoroverlay.h
373+
qgstolerance.h
374+
375+
raster/qgscliptominmaxenhancement.h
376+
raster/qgscolorrampshader.h
377+
raster/qgscolorrampshader.h
378+
raster/qgscontrastenhancement.h
379+
raster/qgscontrastenhancementfunction.h
380+
raster/qgsfreakoutshader.h
381+
raster/qgslinearminmaxenhancement.h
382+
raster/qgslinearminmaxenhancementwithclip.h
383+
raster/qgspseudocolorshader.h
384+
raster/qgsrasterbandstats.h
385+
raster/qgsrasterlayer.h
386+
raster/qgsrastertransparency.h
387+
raster/qgsrastershader.h
388+
raster/qgsrastershaderfunction.h
389+
raster/qgsrasterviewport.h
390+
391+
renderer/qgscontinuouscolorrenderer.h
392+
renderer/qgsgraduatedsymbolrenderer.h
393+
renderer/qgsrenderer.h
394+
renderer/qgssinglesymbolrenderer.h
395+
renderer/qgsuniquevaluerenderer.h
396396

397-
symbology/qgsmarkercatalogue.h
398-
symbology/qgssymbol.h
399-
symbology/qgssymbologyutils.h
397+
symbology/qgsmarkercatalogue.h
398+
symbology/qgssymbol.h
399+
symbology/qgssymbologyutils.h
400400

401-
spatialindex/qgsspatialindex.h
401+
spatialindex/qgsspatialindex.h
402402
)
403403

404404
INSTALL(CODE "MESSAGE(\"Installing CORE headers...\")")

‎src/gui/CMakeLists.txt

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -111,11 +111,6 @@ SET_TARGET_PROPERTIES(qgis_gui PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION
111111
ADD_DEPENDENCIES(qgis_gui ui)
112112

113113
TARGET_LINK_LIBRARIES(qgis_gui
114-
${QT_QTGUI_LIBRARY}
115-
${QT_QTXML_LIBRARY}
116-
${QT_QTSVG_LIBRARY}
117-
${QT_QTNETWORK_LIBRARY}
118-
${QT_QTMAIN_LIBRARY}
119114
qgis_core
120115
)
121116

‎src/plugins/diagram_overlay/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,6 @@ INCLUDE_DIRECTORIES(
4747
)
4848

4949
TARGET_LINK_LIBRARIES(diagramoverlay
50-
${QT_LIBRARIES}
5150
qgis_core
5251
qgis_gui
5352
)

‎src/plugins/dxf2shp_converter/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ INCLUDE_DIRECTORIES(
4242
)
4343

4444
TARGET_LINK_LIBRARIES(dxf2shpconverterplugin
45-
${QT_LIBRARIES}
4645
qgis_core
4746
qgis_gui
4847
)

‎src/plugins/evis/CMakeLists.txt

Lines changed: 1 addition & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
IF (WIN32)
2-
IF (MSVC)
3-
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
4-
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
5-
ELSE (MSVC)
6-
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
7-
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
8-
ENDIF (MSVC)
9-
ELSE (WIN32)
10-
ADD_DEFINITIONS(-DGUI_EXPORT=)
11-
ADD_DEFINITIONS(-DCORE_EXPORT=)
12-
ENDIF (WIN32)
13-
141
########################################################
152
# Files
163

@@ -48,14 +35,6 @@ SET (evis_MOC_HDRS
4835

4936
SET (evis_RCCS resources/evis.qrc)
5037

51-
SET (QT_USE_QT3SUPPORT FALSE)
52-
SET (QT_USE_QTGUI TRUE)
53-
SET (QT_USE_QTSQL TRUE)
54-
SET (QT_USE_QTSVG TRUE)
55-
SET (QT_USE_QTXML TRUE)
56-
SET (QT_USE_QTNETWORK TRUE)
57-
FIND_PACKAGE(Qt4 REQUIRED)
58-
INCLUDE( ${QT_USE_FILE} )
5938
########################################################
6039
# Build
6140

@@ -83,9 +62,9 @@ INCLUDE_DIRECTORIES(
8362
)
8463

8564
TARGET_LINK_LIBRARIES(evis
86-
${QT_LIBRARIES}
8765
qgis_core
8866
qgis_gui
67+
${QT_QTSQL_LIBRARY}
8968
)
9069

9170

‎src/plugins/grass/CMakeLists.txt

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -147,14 +147,9 @@ INCLUDE_DIRECTORIES(
147147
qtermwidget
148148
)
149149

150-
INCLUDE( ${QT_USE_FILE} )
151-
152150
TARGET_LINK_LIBRARIES(grassplugin
153-
qgis_core
154-
qgis_gui
155151
qgisgrass
156-
${QT_QTSQL_LIBRARY}
157-
${GRASS_LIBRARIES}
152+
qgis_gui
158153
)
159154

160155

‎src/plugins/ogr_converter/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ INCLUDE_DIRECTORIES (
5252
)
5353

5454
TARGET_LINK_LIBRARIES(${OGR_CONVERTER_PLUGIN}
55-
${GDAL_LIBRARY}
5655
qgis_core
5756
qgis_gui
5857
)

‎src/plugins/spit/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,6 @@ INCLUDE_DIRECTORIES(
6363

6464
TARGET_LINK_LIBRARIES(spitplugin
6565
${POSTGRES_LIBRARY}
66-
${GDAL_LIBRARY}
6766
qgis_core
6867
qgis_gui
6968
)

‎src/providers/delimitedtext/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,6 @@ QT4_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
2121
ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS} ${DTEXT_MOC_SRCS})
2222

2323
TARGET_LINK_LIBRARIES(delimitedtextprovider
24-
${QT_QTCORE_LIBRARY}
25-
${QT_QTXML_LIBRARY}
26-
${GDAL_LIBRARY}
27-
${GEOS_LIBRARY}
2824
qgis_core
2925
)
3026

‎src/providers/gpx/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,6 @@ QT4_WRAP_CPP(GPX_MOC_SRCS ${GPX_MOC_HDRS})
2222
ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS} ${GPX_MOC_SRCS})
2323

2424
TARGET_LINK_LIBRARIES(gpxprovider
25-
${QT_QTCORE_LIBRARY}
26-
${QT_QTXML_LIBRARY}
27-
${GEOS_LIBRARY}
2825
${EXPAT_LIBRARY}
2926
qgis_core
3027
)

‎src/providers/grass/CMakeLists.txt

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,12 @@ ELSE (WIN32)
3030
ENDIF (WIN32)
3131

3232
TARGET_LINK_LIBRARIES (qgisgrass
33-
${QT_QTCORE_LIBRARY}
34-
${QT_QTXML_LIBRARY}
35-
${GRASS_LIBRARIES}
3633
qgis_core
34+
${GRASS_LIBRARY_gis}
35+
${GRASS_LIBRARY_vect}
36+
${GRASS_LIBRARY_dbmibase}
37+
${GRASS_LIBRARY_dbmiclient}
38+
${GRASS_LIBRARY_gproj}
3739
)
3840

3941
IF (APPLE)
@@ -49,9 +51,6 @@ ELSE (WIN32)
4951
ENDIF (WIN32)
5052

5153
TARGET_LINK_LIBRARIES (grassprovider
52-
${QT_QTCORE_LIBRARY}
53-
${QT_QTXML_LIBRARY}
54-
qgis_core
5554
qgisgrass
5655
)
5756

‎src/providers/memory/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,6 @@ INCLUDE_DIRECTORIES(
1010
ADD_LIBRARY(memoryprovider MODULE ${MEMORY_SRCS})
1111

1212
TARGET_LINK_LIBRARIES(memoryprovider
13-
${QT_QTCORE_LIBRARY}
14-
# ${GDAL_LIBRARY}
15-
# ${GEOS_LIBRARY}
1613
qgis_core
1714
)
1815

‎src/providers/ogr/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,6 @@ INCLUDE_DIRECTORIES(
1919
ADD_LIBRARY(ogrprovider MODULE ${OGR_SRCS} ${OGR_MOC_SRCS})
2020

2121
TARGET_LINK_LIBRARIES(ogrprovider
22-
${QT_QTCORE_LIBRARY}
23-
${QT_QTXML_LIBRARY}
24-
${GDAL_LIBRARY}
25-
${GEOS_LIBRARY}
2622
qgis_core
2723
)
2824
IF (MSVC)

‎src/providers/osm/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,6 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
3232
ADD_LIBRARY (osmprovider MODULE ${OSM_SRCS} ${OSM_MOC_SRCS})
3333

3434
TARGET_LINK_LIBRARIES (osmprovider
35-
${QT_QTCORE_LIBRARY}
36-
${QT_QTXML_LIBRARY}
3735
qgis_core
3836
)
3937

‎src/providers/postgres/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,6 @@ INCLUDE_DIRECTORIES (
2727
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_MOC_SRCS})
2828

2929
TARGET_LINK_LIBRARIES (postgresprovider
30-
${QT_QTCORE_LIBRARY}
31-
${QT_QTXML_LIBRARY}
3230
${POSTGRES_LIBRARY}
3331
qgis_core
3432
)

‎src/providers/spatialite/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,6 @@ INCLUDE_DIRECTORIES(
2121
ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})
2222

2323
TARGET_LINK_LIBRARIES(spatialiteprovider
24-
${QT_QTCORE_LIBRARY}
25-
${QT_QTXML_LIBRARY}
2624
qgis_core
2725
)
2826

‎src/providers/wfs/CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,9 +31,6 @@ INCLUDE_DIRECTORIES (
3131
ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})
3232

3333
TARGET_LINK_LIBRARIES (wfsprovider
34-
${QT_QTCORE_LIBRARY}
35-
${QT_QTXML_LIBRARY}
36-
${GEOS_LIBRARY}
3734
${EXPAT_LIBRARY}
3835
qgis_core
3936
)

‎src/providers/wms/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,6 @@ INCLUDE_DIRECTORIES( . ../../core)
99
ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
1010

1111
TARGET_LINK_LIBRARIES(wmsprovider
12-
${QT_QTCORE_LIBRARY}
13-
${QT_QTXML_LIBRARY}
1412
qgis_core
1513
)
1614

‎src/python/CMakeLists.txt

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -17,17 +17,16 @@ INCLUDE_DIRECTORIES(
1717
../core/renderer
1818
../core/symbology
1919
../gui
20-
${PYTHON_INCLUDE_PATH})
20+
${PYTHON_INCLUDE_PATH}
21+
)
2122

2223
ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
2324

2425
SET_TARGET_PROPERTIES(qgispython PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
2526

2627
TARGET_LINK_LIBRARIES(qgispython
27-
${QT_QTCORE_LIBRARY}
28-
${QT_QTGUI_LIBRARY}
29-
${PYTHON_LIBRARIES}
3028
qgis_core
29+
${PYTHON_LIBRARY}
3130
)
3231

3332
IF (APPLE)

0 commit comments

Comments
 (0)
Please sign in to comment.