sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-13 00:03:09 -04:00
Code Issues Packages Projects Releases Wiki Activity

remove unnecessary linkages

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@12273 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2009-11-28 16:02:15 +00:00
parent 62b8030dd1
commit 6411c7f437
23 changed files with 102 additions and 204 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
cmake/FindGRASS.cmake
View File

@ -5,20 +5,20 @@ MACRO (CHECK_GRASS G_PREFIX)
FIND_PATH (GRASS_INCLUDE_DIR grass/version.h ${G_PREFIX}/include)
SET (GRASS_LIBRARIES_FOUND TRUE)
SET (GRASS_LIB_NAMES gis vect dig2 dbmiclient dbmibase shape dgl rtree datetime linkm form gproj)
SET (GRASS_LIBRARIES "")
FOREACH (LIB ${GRASS_LIB_NAMES})
MARK_AS_ADVANCED ( GRASS_LIBRARY_${LIB} )
SET(LIB_PATH NOTFOUND)
FIND_LIBRARY(LIB_PATH NAMES grass_${LIB} PATHS ${G_PREFIX}/lib NO_DEFAULT_PATH)
IF (LIB_PATH)
IF (NOT GRASS_LIBRARIES STREQUAL NOTFOUND)
SET (GRASS_LIBRARIES ${GRASS_LIBRARIES} ${LIB_PATH})
ENDIF (NOT GRASS_LIBRARIES STREQUAL NOTFOUND)
SET (GRASS_LIBRARY_${LIB} ${LIB_PATH})
ELSE (LIB_PATH)
SET (GRASS_LIBRARIES NOTFOUND)
SET (GRASS_LIBRARY_${LIB} NOTFOUND)
SET (GRASS_LIBRARIES_FOUND FALSE)
ENDIF (LIB_PATH)
ENDFOREACH (LIB)
@ -26,15 +26,12 @@ MACRO (CHECK_GRASS G_PREFIX)
# LIB_PATH is only temporary variable, so hide it (is it possible to delete a variable?)
MARK_AS_ADVANCED(LIB_PATH)
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
IF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
SET (GRASS_FOUND TRUE)
SET (GRASS_PREFIX ${G_PREFIX})
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES)
ENDIF (GRASS_INCLUDE_DIR AND GRASS_LIBRARIES_FOUND)
MARK_AS_ADVANCED (
GRASS_INCLUDE_DIR
GRASS_LIBRARIES
)
MARK_AS_ADVANCED ( GRASS_INCLUDE_DIR )
ENDMACRO (CHECK_GRASS)
@ -80,22 +77,6 @@ IF (GRASS_FOUND)
MESSAGE(STATUS "Found GRASS: ${GRASS_PREFIX} (${GRASS_VERSION})")
ENDIF (NOT GRASS_FIND_QUIETLY)
# openpty is currently needed for GRASS shell
INCLUDE(CheckFunctionExists)
IF (APPLE)
SET (CMAKE_REQUIRED_INCLUDES util.h)
ELSE (APPLE)
SET (CMAKE_REQUIRED_INCLUDES pty.h)
SET (CMAKE_REQUIRED_LIBRARIES util)
ENDIF (APPLE)
CHECK_FUNCTION_EXISTS(openpty HAVE_OPENPTY)
# add 'util' library to the dependencies
IF (HAVE_OPENPTY AND NOT APPLE)
FIND_LIBRARY(OPENPTY_LIBRARY NAMES util PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
SET (GRASS_LIBRARIES ${GRASS_LIBRARIES} ${OPENPTY_LIBRARY})
ENDIF (HAVE_OPENPTY AND NOT APPLE)
ELSE (GRASS_FOUND)
IF (WITH_GRASS)

4
python/configure.py.in
View File

@ -37,9 +37,9 @@ else:
if not os.path.isdir("./core"):
os.mkdir("./core")
if not os.path.isdir("./gui"):
os.mkdir("./gui")
os.mkdir("./gui")
if not os.path.isdir("./analysis"):
os.mkdir("./analysis")
os.mkdir("./analysis")
##########################################################################
# SIP -> *.CPP + *.H

16
src/analysis/CMakeLists.txt
View File

@ -69,24 +69,8 @@ ADD_DEPENDENCIES(qgis_analysis qgis_core)
SET_TARGET_PROPERTIES(qgis_analysis PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
# because of htonl
IF (WIN32)
SET(PLATFORM_LIBRARIES wsock32)
IF (MSVC)
#needed for linking to gdal which needs odbc
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
ENDIF (MSVC)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES(qgis_analysis
qgis_core
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTMAIN_LIBRARY}
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
${PLATFORM_LIBRARIES}
)
IF (APPLE)

7
src/app/CMakeLists.txt
View File

@ -298,18 +298,13 @@ ELSE (WIN32)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES(qgis
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTSQL_LIBRARY}
${QT_QTUITOOLS_LIBRARY}
#should only be needed for win
${QT_QTMAIN_LIBRARY}
qgis_core
qgis_gui
)
)
IF(NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis ${SQLITE_LIBRARY})

160
src/core/CMakeLists.txt
View File

@ -279,24 +279,24 @@ ADD_DEPENDENCIES(qgis_core svnversion)
# because of htonl
IF (WIN32)
SET(PLATFORM_LIBRARIES wsock32)
TARGET_LINK_LIBRARIES(qgis_core wsock32)
IF (MSVC)
#needed for linking to gdal which needs odbc
SET(PLATFORM_LIBRARIES ${PLATFORM_LIBRARIES} odbc32 odbccp32)
# needed for linking to gdal which needs odbc
# TARGET_LINK_LIBRARIES(qgis_core odbc32 odbccp32)
ENDIF (MSVC)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES(qgis_core
${QT_QTMAIN_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTMAIN_LIBRARY}
${QT_QTSVG_LIBRARY}
${PROJ_LIBRARY}
${GEOS_LIBRARY}
${GDAL_LIBRARY}
${PLATFORM_LIBRARIES}
)
IF (WITH_INTERNAL_SPATIALITE)
@ -323,82 +323,82 @@ INSTALL(TARGETS qgis_core
# Added by Tim to install headers
SET(QGIS_CORE_HDRS
qgis.h
qgsapplication.h
qgsattributeaction.h
qgscentralpointpositionmanager.h
qgsclipper.h
qgscontexthelp.h
qgscoordinatetransform.h
qgsdatasourceuri.h
qgsdistancearea.h
qgscsexception.h
qgsexception.h
qgsfeature.h
qgsfield.h
qgsgeometry.h
qgshttptransaction.h
qgslabel.h
qgslabelattributes.h
qgslogger.h
qgsmaplayer.h
qgsmaplayerregistry.h
qgsmaprenderer.h
qgsmaptopixel.h
qgsmessageoutput.h
qgsoverlayobjectpositionmanager.h
qgspalobjectpositionmanager.h
qgspoint.h
qgsproject.h
qgsprojectfiletransform.h
qgsprojectproperty.h
qgsprojectversion.h
qgsprovidercountcalcevent.h
qgsproviderextentcalcevent.h
qgsprovidermetadata.h
qgsproviderregistry.h
qgsrasterdataprovider.h
qgsrectangle.h
qgsrendercontext.h
qgsrunprocess.h
qgsscalecalculator.h
qgssearchstring.h
qgssearchtreenode.h
qgssnapper.h
qgscoordinatereferencesystem.h
qgsvectordataprovider.h
qgsvectorfilewriter.h
qgsvectorlayer.h
qgsvectoroverlay.h
qgstolerance.h
qgis.h
qgsapplication.h
qgsattributeaction.h
qgscentralpointpositionmanager.h
qgsclipper.h
qgscontexthelp.h
qgscoordinatetransform.h
qgsdatasourceuri.h
qgsdistancearea.h
qgscsexception.h
qgsexception.h
qgsfeature.h
qgsfield.h
qgsgeometry.h
qgshttptransaction.h
qgslabel.h
qgslabelattributes.h
qgslogger.h
qgsmaplayer.h
qgsmaplayerregistry.h
qgsmaprenderer.h
qgsmaptopixel.h
qgsmessageoutput.h
qgsoverlayobjectpositionmanager.h
qgspalobjectpositionmanager.h
qgspoint.h
qgsproject.h
qgsprojectfiletransform.h
qgsprojectproperty.h
qgsprojectversion.h
qgsprovidercountcalcevent.h
qgsproviderextentcalcevent.h
qgsprovidermetadata.h
qgsproviderregistry.h
qgsrasterdataprovider.h
qgsrectangle.h
qgsrendercontext.h
qgsrunprocess.h
qgsscalecalculator.h
qgssearchstring.h
qgssearchtreenode.h
qgssnapper.h
qgscoordinatereferencesystem.h
qgsvectordataprovider.h
qgsvectorfilewriter.h
qgsvectorlayer.h
qgsvectoroverlay.h
qgstolerance.h
raster/qgscliptominmaxenhancement.h
raster/qgscolorrampshader.h
raster/qgscolorrampshader.h
raster/qgscontrastenhancement.h
raster/qgscontrastenhancementfunction.h
raster/qgsfreakoutshader.h
raster/qgslinearminmaxenhancement.h
raster/qgslinearminmaxenhancementwithclip.h
raster/qgspseudocolorshader.h
raster/qgsrasterbandstats.h
raster/qgsrasterlayer.h
raster/qgsrastertransparency.h
raster/qgsrastershader.h
raster/qgsrastershaderfunction.h
raster/qgsrasterviewport.h
raster/qgscliptominmaxenhancement.h
raster/qgscolorrampshader.h
raster/qgscolorrampshader.h
raster/qgscontrastenhancement.h
raster/qgscontrastenhancementfunction.h
raster/qgsfreakoutshader.h
raster/qgslinearminmaxenhancement.h
raster/qgslinearminmaxenhancementwithclip.h
raster/qgspseudocolorshader.h
raster/qgsrasterbandstats.h
raster/qgsrasterlayer.h
raster/qgsrastertransparency.h
raster/qgsrastershader.h
raster/qgsrastershaderfunction.h
raster/qgsrasterviewport.h
renderer/qgscontinuouscolorrenderer.h
renderer/qgsgraduatedsymbolrenderer.h
renderer/qgsrenderer.h
renderer/qgssinglesymbolrenderer.h
renderer/qgsuniquevaluerenderer.h
renderer/qgscontinuouscolorrenderer.h
renderer/qgsgraduatedsymbolrenderer.h
renderer/qgsrenderer.h
renderer/qgssinglesymbolrenderer.h
renderer/qgsuniquevaluerenderer.h
symbology/qgsmarkercatalogue.h
symbology/qgssymbol.h
symbology/qgssymbologyutils.h
symbology/qgsmarkercatalogue.h
symbology/qgssymbol.h
symbology/qgssymbologyutils.h
spatialindex/qgsspatialindex.h
spatialindex/qgsspatialindex.h
)
INSTALL(CODE "MESSAGE(\"Installing CORE headers...\")")

5
src/gui/CMakeLists.txt
View File

@ -111,11 +111,6 @@ SET_TARGET_PROPERTIES(qgis_gui PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION
ADD_DEPENDENCIES(qgis_gui ui)
TARGET_LINK_LIBRARIES(qgis_gui
${QT_QTGUI_LIBRARY}
${QT_QTXML_LIBRARY}
${QT_QTSVG_LIBRARY}
${QT_QTNETWORK_LIBRARY}
${QT_QTMAIN_LIBRARY}
qgis_core
)

1
src/plugins/diagram_overlay/CMakeLists.txt
View File

@ -47,7 +47,6 @@ INCLUDE_DIRECTORIES(
)
TARGET_LINK_LIBRARIES(diagramoverlay
${QT_LIBRARIES}
qgis_core
qgis_gui
)

1
src/plugins/dxf2shp_converter/CMakeLists.txt
View File

@ -42,7 +42,6 @@ INCLUDE_DIRECTORIES(
)
TARGET_LINK_LIBRARIES(dxf2shpconverterplugin
${QT_LIBRARIES}
qgis_core
qgis_gui
)

23
src/plugins/evis/CMakeLists.txt
View File

@ -1,16 +1,3 @@
IF (WIN32)
IF (MSVC)
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
ELSE (WIN32)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DCORE_EXPORT=)
ENDIF (WIN32)
########################################################
# Files
@ -48,14 +35,6 @@ SET (evis_MOC_HDRS
SET (evis_RCCS resources/evis.qrc)
SET (QT_USE_QT3SUPPORT FALSE)
SET (QT_USE_QTGUI TRUE)
SET (QT_USE_QTSQL TRUE)
SET (QT_USE_QTSVG TRUE)
SET (QT_USE_QTXML TRUE)
SET (QT_USE_QTNETWORK TRUE)
FIND_PACKAGE(Qt4 REQUIRED)
INCLUDE( ${QT_USE_FILE} )
########################################################
# Build
@ -83,9 +62,9 @@ INCLUDE_DIRECTORIES(
)
TARGET_LINK_LIBRARIES(evis
${QT_LIBRARIES}
qgis_core
qgis_gui
${QT_QTSQL_LIBRARY}
)

7
src/plugins/grass/CMakeLists.txt
View File

@ -147,14 +147,9 @@ INCLUDE_DIRECTORIES(
qtermwidget
)
INCLUDE( ${QT_USE_FILE} )
TARGET_LINK_LIBRARIES(grassplugin
qgis_core
qgis_gui
qgisgrass
${QT_QTSQL_LIBRARY}
${GRASS_LIBRARIES}
qgis_gui
)

1
src/plugins/ogr_converter/CMakeLists.txt
View File

@ -52,7 +52,6 @@ INCLUDE_DIRECTORIES (
)
TARGET_LINK_LIBRARIES(${OGR_CONVERTER_PLUGIN}
${GDAL_LIBRARY}
qgis_core
qgis_gui
)

1
src/plugins/spit/CMakeLists.txt
View File

@ -63,7 +63,6 @@ INCLUDE_DIRECTORIES(
TARGET_LINK_LIBRARIES(spitplugin
${POSTGRES_LIBRARY}
${GDAL_LIBRARY}
qgis_core
qgis_gui
)

4
src/providers/delimitedtext/CMakeLists.txt
View File

@ -21,10 +21,6 @@ QT4_WRAP_CPP(DTEXT_MOC_SRCS ${DTEXT_MOC_HDRS})
ADD_LIBRARY(delimitedtextprovider MODULE ${DTEXT_SRCS} ${DTEXT_MOC_SRCS})
TARGET_LINK_LIBRARIES(delimitedtextprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
qgis_core
)

3
src/providers/gpx/CMakeLists.txt
View File

@ -22,9 +22,6 @@ QT4_WRAP_CPP(GPX_MOC_SRCS ${GPX_MOC_HDRS})
ADD_LIBRARY(gpxprovider MODULE ${GPX_SRCS} ${GPX_MOC_SRCS})
TARGET_LINK_LIBRARIES(gpxprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GEOS_LIBRARY}
${EXPAT_LIBRARY}
qgis_core
)

11
src/providers/grass/CMakeLists.txt
View File

@ -30,10 +30,12 @@ ELSE (WIN32)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES (qgisgrass
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GRASS_LIBRARIES}
qgis_core
${GRASS_LIBRARY_gis}
${GRASS_LIBRARY_vect}
${GRASS_LIBRARY_dbmibase}
${GRASS_LIBRARY_dbmiclient}
${GRASS_LIBRARY_gproj}
)
IF (APPLE)
@ -49,9 +51,6 @@ ELSE (WIN32)
ENDIF (WIN32)
TARGET_LINK_LIBRARIES (grassprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
qgisgrass
)

3
src/providers/memory/CMakeLists.txt
View File

@ -10,9 +10,6 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY(memoryprovider MODULE ${MEMORY_SRCS})
TARGET_LINK_LIBRARIES(memoryprovider
${QT_QTCORE_LIBRARY}
# ${GDAL_LIBRARY}
# ${GEOS_LIBRARY}
qgis_core
)

4
src/providers/ogr/CMakeLists.txt
View File

@ -19,10 +19,6 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY(ogrprovider MODULE ${OGR_SRCS} ${OGR_MOC_SRCS})
TARGET_LINK_LIBRARIES(ogrprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GDAL_LIBRARY}
${GEOS_LIBRARY}
qgis_core
)
IF (MSVC)

2
src/providers/osm/CMakeLists.txt
View File

@ -32,8 +32,6 @@ ENDIF (WITH_INTERNAL_SPATIALITE)
ADD_LIBRARY (osmprovider MODULE ${OSM_SRCS} ${OSM_MOC_SRCS})
TARGET_LINK_LIBRARIES (osmprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
)

2
src/providers/postgres/CMakeLists.txt
View File

@ -27,8 +27,6 @@ INCLUDE_DIRECTORIES (
ADD_LIBRARY (postgresprovider MODULE ${PG_SRCS} ${PG_MOC_SRCS})
TARGET_LINK_LIBRARIES (postgresprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${POSTGRES_LIBRARY}
qgis_core
)

2
src/providers/spatialite/CMakeLists.txt
View File

@ -21,8 +21,6 @@ INCLUDE_DIRECTORIES(
ADD_LIBRARY (spatialiteprovider MODULE ${SPATIALITE_SRCS} ${SPATIALITE_MOC_SRCS})
TARGET_LINK_LIBRARIES(spatialiteprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
)

3
src/providers/wfs/CMakeLists.txt
View File

@ -31,9 +31,6 @@ INCLUDE_DIRECTORIES (
ADD_LIBRARY (wfsprovider MODULE ${WFS_SRCS} ${WFS_MOC_SRCS})
TARGET_LINK_LIBRARIES (wfsprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
${GEOS_LIBRARY}
${EXPAT_LIBRARY}
qgis_core
)

2
src/providers/wms/CMakeLists.txt
View File

@ -9,8 +9,6 @@ INCLUDE_DIRECTORIES( . ../../core)
ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS})
TARGET_LINK_LIBRARIES(wmsprovider
${QT_QTCORE_LIBRARY}
${QT_QTXML_LIBRARY}
qgis_core
)

7
src/python/CMakeLists.txt
View File

@ -17,17 +17,16 @@ INCLUDE_DIRECTORIES(
../core/renderer
../core/symbology
../gui
${PYTHON_INCLUDE_PATH})
${PYTHON_INCLUDE_PATH}
)
ADD_LIBRARY (qgispython SHARED ${QGISPYTHON_SRCS})
SET_TARGET_PROPERTIES(qgispython PROPERTIES VERSION ${COMPLETE_VERSION} SOVERSION ${COMPLETE_VERSION})
TARGET_LINK_LIBRARIES(qgispython
${QT_QTCORE_LIBRARY}
${QT_QTGUI_LIBRARY}
${PYTHON_LIBRARIES}
qgis_core
${PYTHON_LIBRARY}
)
IF (APPLE)