From 0fb3f48d1216119577808da375245d9ddd206554 Mon Sep 17 00:00:00 2001 From: homann Date: Sat, 3 Feb 2007 12:35:27 +0000 Subject: [PATCH] Fixed CMake files for 0.8 built on win32. Does not build wms, and postgres is not tested/does not work. All qgis files are compiled into qgis_core.dll (raster, legend, composer, gui, core). Resulting binary crashes, but runs in gdb. Beware! Please see build instructions for trunk on win32, the same environment is used here. git-svn-id: http://svn.osgeo.org/qgis/branches/Release-0_8_0@6506 c8812cc2-4d05-0410-92ff-de0c093fc19c --- CMakeLists.txt | 6 +- src/core/CMakeLists.txt | 199 +++++++++++++++++- src/core/qgspluginregistry.cpp | 1 + src/gui/CMakeLists.txt | 232 ++------------------- src/plugins/copyright_label/CMakeLists.txt | 92 ++++---- src/plugins/delimited_text/CMakeLists.txt | 100 ++++----- src/plugins/geoprocessing/CMakeLists.txt | 1 - src/plugins/georeferencer/CMakeLists.txt | 3 +- src/plugins/gps_importer/CMakeLists.txt | 3 +- src/plugins/grass/CMakeLists.txt | 1 - src/plugins/grid_maker/CMakeLists.txt | 157 +++++++------- src/plugins/north_arrow/CMakeLists.txt | 100 ++++----- src/plugins/scale_bar/CMakeLists.txt | 2 +- src/plugins/spit/CMakeLists.txt | 2 - src/plugins/wfs/CMakeLists.txt | 1 - src/providers/CMakeLists.txt | 3 +- src/providers/wms/CMakeLists.txt | 2 +- tools/mapserver_export/CMakeLists.txt | 1 - 18 files changed, 450 insertions(+), 456 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index db95b0479f1a..975d6c88adec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -120,9 +120,11 @@ ENDIF (CMAKE_BUILD_TYPE MATCHES Debug) IF (WIN32) SET (QGIS_BIN_DIR ${CMAKE_INSTALL_PREFIX}) - SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}) - SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/plugins) + SET (QGIS_DATA_DIR ${CMAKE_INSTALL_PREFIX}/share/qgis) + SET (QGIS_PLUGIN_DIR ${CMAKE_INSTALL_PREFIX}/lib/qgis) + SET (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-runtime-pseudo-reloc") + SET (CMAKE_MODULE_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,--enable-runtime-pseudo-reloc") ELSE (WIN32) IF (APPLE) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index fcd184b2ca9a..293c79f4ed37 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -1,3 +1,169 @@ +SET(QGIS_GUI_SRCS +../gui/qgisapp.cpp +../gui/qgisiface.cpp +../gui/qgisinterface.cpp +../gui/qgsabout.cpp +../gui/qgsaddattrdialog.cpp +../gui/qgsattributeaction.cpp +../gui/qgsattributeactiondialog.cpp +../gui/qgsattributedialog.cpp +../gui/qgsattributetable.cpp +../gui/qgsattributetabledisplay.cpp +../gui/qgsbookmarks.cpp +../gui/qgsclipboard.cpp +../gui/qgscolorbutton.cpp +../gui/qgscontinuouscolordialog.cpp +../gui/qgscontinuouscolorrenderer.cpp +../gui/qgscoordinatetransform.cpp +../gui/qgscursors.cpp +../gui/qgscustomprojectiondialog.cpp +../gui/qgsdelattrdialog.cpp +../gui/qgsencodingfiledialog.cpp +../gui/qgsfillstylewidget.cpp +../gui/qgsgeomtypedialog.cpp +../gui/qgsgraduatedsymboldialog.cpp +../gui/qgsgraduatedsymbolrenderer.cpp +../gui/qgshelpviewer.cpp +../gui/qgsidentifyresults.cpp +../gui/qgslabel.cpp +../gui/qgslabeldialog.cpp +../gui/qgslayerprojectionselector.cpp +../gui/qgslinestyledialog.cpp +../gui/qgslinestylewidget.cpp +../gui/qgsludialog.cpp +../gui/qgsmapcanvas.cpp +../gui/qgsmapcanvasitem.cpp +../gui/qgsmapcanvasmap.cpp +../gui/qgsmaplayer.cpp +../gui/qgsmaplayerregistry.cpp +../gui/qgsmaplayerset.cpp +../gui/qgsmapoverviewcanvas.cpp +../gui/qgsmaprender.cpp +../gui/qgsmaptoolcapture.cpp +../gui/qgsmaptool.cpp +../gui/qgsmaptoolidentify.cpp +../gui/qgsmaptoolpan.cpp +../gui/qgsmaptoolselect.cpp +../gui/qgsmaptoolvertexedit.cpp +../gui/qgsmaptoolzoom.cpp +../gui/qgsmarkerdialog.cpp +../gui/qgsmeasure.cpp +../gui/qgsmessageviewer.cpp +../gui/qgsnewhttpconnection.cpp +../gui/qgsoptions.cpp +../gui/qgspastetransformations.cpp +../gui/qgspatterndialog.cpp +../gui/qgspgutil.cpp +../gui/qgspluginmanager.cpp +../gui/qgspointstylewidget.cpp +../gui/qgsproject.cpp +../gui/qgsprojectproperties.cpp +../gui/qgsrasterlayerproperties.cpp +../gui/qgsrubberband.cpp +../gui/qgsrunprocess.cpp +../gui/qgssearchquerybuilder.cpp +../gui/qgsserversourceselect.cpp +../gui/qgssinglesymboldialog.cpp +../gui/qgssinglesymbolrenderer.cpp +../gui/qgsspatialrefsys.cpp +../gui/qgsuniquevaluedialog.cpp +../gui/qgsuniquevaluerenderer.cpp +../gui/qgsvectorfilewriter.cpp +../gui/qgsvectorlayer.cpp +../gui/qgsvectorlayerproperties.cpp +../gui/qgsvertexmarker.cpp +../widgets/projectionselector/qgsprojectionselector.cpp + +../composer/qgscomposer.cpp +../composer/qgscomposeritem.cpp +../composer/qgscomposerlabel.cpp +../composer/qgscomposermap.cpp +../composer/qgscomposerpicture.cpp +../composer/qgscomposerscalebar.cpp +../composer/qgscomposervectorlegend.cpp +../composer/qgscomposerview.cpp +../composer/qgscomposition.cpp + +../legend/qgslegend.cpp +../legend/qgslegendgroup.cpp +../legend/qgslegenditem.cpp +../legend/qgslegendlayer.cpp +../legend/qgslegendlayerfile.cpp +../legend/qgslegendlayerfilegroup.cpp +../legend/qgslegendpropertygroup.cpp +../legend/qgslegendpropertyitem.cpp +../legend/qgslegendsymbologygroup.cpp +../legend/qgslegendsymbologyitem.cpp +../legend/qgslegendvectorsymbologyitem.cpp + +../raster/qgsrasterlayer.cpp + +) + +SET(QGIS_GUI_MOC_HDRS +../gui/qgsnewhttpconnection.h +../gui/qgshelpviewer.h +../gui/qgsattributetable.h +../gui/qgssearchquerybuilder.h +../gui/qgsattributeactiondialog.h +../gui/qgslinestyledialog.h +../gui/qgsabout.h +../gui/qgsmaprender.h +../gui/qgsdelattrdialog.h +../gui/qgsmeasure.h +../gui/qgsgeomtypedialog.h +../gui/qgsgraduatedsymboldialog.h +../gui/qgscustomprojectiondialog.h +../gui/qgspastetransformations.h +../gui/qgscontinuouscolordialog.h +../gui/qgssinglesymboldialog.h +../gui/qgsbookmarks.h +../gui/qgsfillstylewidget.h +../gui/qgsmarkerdialog.h +../gui/qgsidentifyresults.h +../gui/qgsvectorlayerproperties.h +../gui/qgsserversourceselect.h +../gui/qgspluginmanager.h +../gui/qgspatterndialog.h +../gui/qgsaddattrdialog.h +../gui/qgsattributetabledisplay.h +../gui/qgsattributedialog.h +../gui/qgsoptions.h +../gui/qgsludialog.h +../gui/qgslinestylewidget.h +../gui/qgisapp.h +../gui/qgisiface.h +../gui/qgisinterface.h +../gui/qgscoordinatetransform.h +../gui/qgsencodingfiledialog.h +../gui/qgslabeldialog.h +../gui/qgslayerprojectionselector.h +../gui/qgsmapcanvas.h +../gui/qgsmapcanvasitem.h +../gui/qgsmapoverviewcanvas.h +../gui/qgsmaplayer.h +../gui/qgsmaplayerregistry.h +../gui/qgsmaptoolidentify.h +../gui/qgspointstylewidget.h +../widgets/projectionselector/qgsprojectionselector.h +../gui/qgsproject.h +../gui/qgsprojectproperties.h +../gui/qgsrasterlayerproperties.h +../gui/qgsrunprocess.h +../gui/qgsuniquevaluedialog.h +../gui/qgsvectorlayer.h +../legend/qgslegend.h +../composer/qgscomposermap.h +../composer/qgscomposerlabel.h +../composer/qgscomposer.h +../composer/qgscomposerpicture.h +../composer/qgscomposerscalebar.h +../composer/qgscomposervectorlegend.h +../composer/qgscomposerview.h +../composer/qgscomposition.h + +../raster/qgsrasterlayer.h +) ############################################################# @@ -31,6 +197,7 @@ qgsmarkersymbol.cpp qgsnumericsortlistviewitem.cpp qgspluginitem.cpp qgspluginregistry.cpp +../gui/qgspluginmetadata.cpp qgspoint.cpp qgspolygonsymbol.cpp qgsprojectproperty.cpp @@ -50,7 +217,6 @@ qgssymbol.cpp qgssymbologyutils.cpp qgsvectordataprovider.cpp -../raster/qgsrasterlayer.cpp ) @@ -64,12 +230,31 @@ qgsdataprovider.h qgshttptransaction.h qgsrasterdataprovider.h -../raster/qgsrasterlayer.h ) +IF (POSTGRES_FOUND) + SET (QGIS_GUI_SRCS ${QGIS_GUI_SRCS} + ../gui/qgsdbsourceselect.cpp + ../gui/qgsnewconnection.cpp + ../gui/qgspgquerybuilder.cpp + ) + SET (QGIS_GUI_MOC_HDRS ${QGIS_GUI_MOC_HDRS} + ../gui/qgsdbsourceselect.h + ../gui/qgsnewconnection.h + ../gui/qgspgquerybuilder.h + ) +ENDIF (POSTGRES_FOUND) + +QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS}) QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS}) -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../raster ../legend ../gui +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ../raster + ../legend + ../gui + ../composer + ../plugins + ../widgets/projectionselector ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}/../ui ${QT_QTSVG_INCLUDE_DIR} @@ -90,10 +275,10 @@ ENDIF (WIN32) ############################################################# # qgis_core library -ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC}) +ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS} ${INDEX_SRC}) # make sure to create qgssvnversion.h before compiling -ADD_DEPENDENCIES(qgis_core svnversionsounds ui) +ADD_DEPENDENCIES(qgis_core svnversion ui) # because of htonl IF (WIN32) @@ -109,6 +294,10 @@ TARGET_LINK_LIBRARIES(qgis_core ${PLATFORM_LIBRARIES} ) +IF (POSTGRES_FOUND) + TARGET_LINK_LIBRARIES (qgis_core ${POSTGRES_LIBRARY}) +ENDIF (POSTGRES_FOUND) + INSTALL(TARGETS qgis_core RUNTIME DESTINATION ${QGIS_BIN_DIR} LIBRARY DESTINATION lib) diff --git a/src/core/qgspluginregistry.cpp b/src/core/qgspluginregistry.cpp index 97199bf9d840..171bc80e3601 100644 --- a/src/core/qgspluginregistry.cpp +++ b/src/core/qgspluginregistry.cpp @@ -24,6 +24,7 @@ #include #include #include "qgsprovidermetadata.h" +#include "qgspluginmetadata.h" #include "qgspluginregistry.h" QgsPluginRegistry *QgsPluginRegistry::_instance = 0; diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index 5f20f2ab010f..e87e6cddbfa1 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -1,185 +1,5 @@ - -SET(QGIS_GUI_SRCS -qgisapp.cpp -qgisiface.cpp -qgisinterface.cpp -qgsabout.cpp -qgsaddattrdialog.cpp -qgsattributeaction.cpp -qgsattributeactiondialog.cpp -qgsattributedialog.cpp -qgsattributetable.cpp -qgsattributetabledisplay.cpp -qgsbookmarks.cpp -qgsclipboard.cpp -qgscolorbutton.cpp -qgscontinuouscolordialog.cpp -qgscontinuouscolorrenderer.cpp -qgscoordinatetransform.cpp -qgscursors.cpp -qgscustomprojectiondialog.cpp -qgsdelattrdialog.cpp -qgsencodingfiledialog.cpp -qgsfillstylewidget.cpp -qgsgeomtypedialog.cpp -qgsgraduatedsymboldialog.cpp -qgsgraduatedsymbolrenderer.cpp -qgshelpviewer.cpp -qgsidentifyresults.cpp -qgslabel.cpp -qgslabeldialog.cpp -qgslayerprojectionselector.cpp -qgslinestyledialog.cpp -qgslinestylewidget.cpp -qgsludialog.cpp -qgsmapcanvas.cpp -qgsmapcanvasitem.cpp -qgsmapcanvasmap.cpp -qgsmaplayer.cpp -qgsmaplayerregistry.cpp -qgsmaplayerset.cpp -qgsmapoverviewcanvas.cpp -qgsmaprender.cpp -qgsmaptoolcapture.cpp -qgsmaptool.cpp -qgsmaptoolidentify.cpp -qgsmaptoolpan.cpp -qgsmaptoolselect.cpp -qgsmaptoolvertexedit.cpp -qgsmaptoolzoom.cpp -qgsmarkerdialog.cpp -qgsmeasure.cpp -qgsmessageviewer.cpp -qgsnewhttpconnection.cpp -qgsoptions.cpp -qgspastetransformations.cpp -qgspatterndialog.cpp -qgspgutil.cpp -qgspluginmanager.cpp -qgspluginmetadata.cpp -qgspointstylewidget.cpp -qgsproject.cpp -qgsprojectproperties.cpp -qgsrasterlayerproperties.cpp -qgsrubberband.cpp -qgsrunprocess.cpp -qgssearchquerybuilder.cpp -qgsserversourceselect.cpp -qgssinglesymboldialog.cpp -qgssinglesymbolrenderer.cpp -qgsspatialrefsys.cpp -qgsuniquevaluedialog.cpp -qgsuniquevaluerenderer.cpp -qgsvectorfilewriter.cpp -qgsvectorlayer.cpp -qgsvectorlayerproperties.cpp -qgsvertexmarker.cpp -../widgets/projectionselector/qgsprojectionselector.cpp - -../composer/qgscomposer.cpp -../composer/qgscomposeritem.cpp -../composer/qgscomposerlabel.cpp -../composer/qgscomposermap.cpp -../composer/qgscomposerpicture.cpp -../composer/qgscomposerscalebar.cpp -../composer/qgscomposervectorlegend.cpp -../composer/qgscomposerview.cpp -../composer/qgscomposition.cpp - -../legend/qgslegend.cpp -../legend/qgslegendgroup.cpp -../legend/qgslegenditem.cpp -../legend/qgslegendlayer.cpp -../legend/qgslegendlayerfile.cpp -../legend/qgslegendlayerfilegroup.cpp -../legend/qgslegendpropertygroup.cpp -../legend/qgslegendpropertyitem.cpp -../legend/qgslegendsymbologygroup.cpp -../legend/qgslegendsymbologyitem.cpp -../legend/qgslegendvectorsymbologyitem.cpp - -) - -SET(QGIS_GUI_MOC_HDRS -qgsnewhttpconnection.h -qgshelpviewer.h -qgsattributetable.h -qgssearchquerybuilder.h -qgsattributeactiondialog.h -qgslinestyledialog.h -qgsabout.h -qgsmaprender.h -qgsdelattrdialog.h -qgsmeasure.h -qgsgeomtypedialog.h -qgsgraduatedsymboldialog.h -qgscustomprojectiondialog.h -qgspastetransformations.h -qgscontinuouscolordialog.h -qgssinglesymboldialog.h -qgsbookmarks.h -qgsfillstylewidget.h -qgsmarkerdialog.h -qgsidentifyresults.h -qgsvectorlayerproperties.h -qgsserversourceselect.h -qgspluginmanager.h -qgspatterndialog.h -qgsaddattrdialog.h -qgsattributetabledisplay.h -qgsattributedialog.h -qgsoptions.h -qgsludialog.h -qgslinestylewidget.h -qgisapp.h -qgisiface.h -qgisinterface.h -qgscoordinatetransform.h -qgsencodingfiledialog.h -qgslabeldialog.h -qgslayerprojectionselector.h -qgsmapcanvas.h -qgsmapcanvasitem.h -qgsmapoverviewcanvas.h -qgsmaplayer.h -qgsmaplayerregistry.h -qgsmaptoolidentify.h -qgspointstylewidget.h -../widgets/projectionselector/qgsprojectionselector.h -qgsproject.h -qgsprojectproperties.h -qgsrasterlayerproperties.h -qgsrunprocess.h -qgsuniquevaluedialog.h -qgsvectorlayer.h -../legend/qgslegend.h -../composer/qgscomposermap.h -../composer/qgscomposerlabel.h -../composer/qgscomposer.h -../composer/qgscomposerpicture.h -../composer/qgscomposerscalebar.h -../composer/qgscomposervectorlegend.h -../composer/qgscomposerview.h -../composer/qgscomposition.h -) - -IF (POSTGRES_FOUND) - SET (QGIS_GUI_SRCS ${QGIS_GUI_SRCS} - qgsdbsourceselect.cpp - qgsnewconnection.cpp - qgspgquerybuilder.cpp - ) - SET (QGIS_GUI_MOC_HDRS ${QGIS_GUI_MOC_HDRS} - qgsdbsourceselect.h - qgsnewconnection.h - qgspgquerybuilder.h - ) -ENDIF (POSTGRES_FOUND) - - -QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS}) - -INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../core +INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} + ../core ../raster ../legend ../composer ../plugins ../widgets/projectionselector ${SQLITE3_INCLUDE_DIR} @@ -188,53 +8,43 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../core ${CMAKE_CURRENT_BINARY_DIR}/../../tools/mapserver_export ) -IF (POSTGRES_FOUND) - INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR}) -ENDIF (POSTGRES_FOUND) - +SET(QGIS_APP_SRCS main.cpp) IF (WIN32) - IF (MSVC) - ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)") - ELSE (MSVC) - ADD_DEFINITIONS("-UGUI_EXPORT \"-DGUI_EXPORT=__declspec(dllexport)\"") - ENDIF (MSVC) -ENDIF (WIN32) + # Icon for windows + # Note: can't include .rc directly to source files + # as it's ignored when used MinGW -############################################################# -# qgis_gui library + IF (NOT WINDRES) + FIND_PROGRAM(WINDRES windres) + IF (NOT WINDRES) + MESSAGE(FATAL_ERROR "windres not found - aborting") + ENDIF (NOT WINDRES) + ENDIF (NOT WINDRES) + ADD_CUSTOM_COMMAND(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj + COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR}/.. + -i${CMAKE_CURRENT_SOURCE_DIR}/../qgis_win32.rc + -o ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj) + SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/qgis_win32.obj) -ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS}) - -# make sure that UI files will be processed first -ADD_DEPENDENCIES(qgis_gui ui) - -TARGET_LINK_LIBRARIES(qgis_gui - ${QT_LIBRARIES} - ${SQLITE3_LIBRARIES} - qgis_core -) - -INSTALL(TARGETS qgis_gui - RUNTIME DESTINATION ${QGIS_BIN_DIR} - LIBRARY DESTINATION lib) +ENDIF (WIN32) -############# -ADD_EXECUTABLE(qgis main.cpp) +ADD_EXECUTABLE(qgis ${QGIS_APP_SRCS}) TARGET_LINK_LIBRARIES(qgis ${QT_LIBRARIES} qgis_core - qgis_gui ) IF (POSTGRES_FOUND) TARGET_LINK_LIBRARIES (qgis ${POSTGRES_LIBRARY}) ENDIF (POSTGRES_FOUND) + + IF (APPLE) # For Mac OS X, the executable must be at the root of the bundle's executable folder INSTALL(TARGETS qgis RUNTIME DESTINATION ${CMAKE_INSTALL_PREFIX}) diff --git a/src/plugins/copyright_label/CMakeLists.txt b/src/plugins/copyright_label/CMakeLists.txt index 8ac1ac913304..bf1bc586dbd5 100644 --- a/src/plugins/copyright_label/CMakeLists.txt +++ b/src/plugins/copyright_label/CMakeLists.txt @@ -1,46 +1,46 @@ - -######################################################## -# Files - -SET (COPYRIGHT_SRCS - plugin.cpp - plugingui.cpp -) - -SET (COPYRIGHT_UIS pluginguibase.ui) - -SET (COPYRIGHT_MOC_HDRS plugin.h plugingui.h) - -SET (COPYRIGHT_RCCS copyright_plugin.qrc) - -######################################################## -# Build - -QT4_WRAP_UI (COPYRIGHT_UIS_H ${COPYRIGHT_UIS}) - -QT4_WRAP_CPP (COPYRIGHT_MOC_SRCS ${COPYRIGHT_MOC_HDRS}) - -QT4_ADD_RESOURCES(COPYRIGHT_RCC_SRCS ${COPYRIGHT_RCCS}) - -ADD_LIBRARY (copyrightlabelplugin MODULE ${COPYRIGHT_SRCS} ${COPYRIGHT_MOC_SRCS} ${COPYRIGHT_RCC_SRCS} ${COPYRIGHT_UIS_H}) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ../../core ../../core/raster ../../core/renderer ../../core/symbology - ../../gui - ${CMAKE_CURRENT_BINARY_DIR}/../../ui - .. -) - -TARGET_LINK_LIBRARIES(copyrightlabelplugin - qgis_core - qgis_gui -) - - -######################################################## -# Install - -INSTALL(TARGETS copyrightlabelplugin - RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} - LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) + +######################################################## +# Files + +SET (COPYRIGHT_SRCS + plugin.cpp + plugingui.cpp +) + +SET (COPYRIGHT_UIS pluginguibase.ui) + +SET (COPYRIGHT_MOC_HDRS plugin.h plugingui.h) + +SET (COPYRIGHT_RCCS copyright_plugin.qrc) + +######################################################## +# Build + +QT4_WRAP_UI (COPYRIGHT_UIS_H ${COPYRIGHT_UIS}) + +QT4_WRAP_CPP (COPYRIGHT_MOC_SRCS ${COPYRIGHT_MOC_HDRS}) + +QT4_ADD_RESOURCES(COPYRIGHT_RCC_SRCS ${COPYRIGHT_RCCS}) + +ADD_LIBRARY (copyrightlabelplugin MODULE ${COPYRIGHT_SRCS} ${COPYRIGHT_MOC_SRCS} ${COPYRIGHT_RCC_SRCS} ${COPYRIGHT_UIS_H}) + +INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ../../core ../../core/raster ../../core/renderer ../../core/symbology + ../../gui + ${CMAKE_CURRENT_BINARY_DIR}/../../ui + .. + ${GEOS_INCLUDE_DIR} +) + +TARGET_LINK_LIBRARIES(copyrightlabelplugin + qgis_core +) + + +######################################################## +# Install + +INSTALL(TARGETS copyrightlabelplugin + RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} + LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) diff --git a/src/plugins/delimited_text/CMakeLists.txt b/src/plugins/delimited_text/CMakeLists.txt index 22e508e37c91..4029197bdaa5 100644 --- a/src/plugins/delimited_text/CMakeLists.txt +++ b/src/plugins/delimited_text/CMakeLists.txt @@ -1,50 +1,50 @@ - -######################################################## -# Files - -SET (DLTEXT_SRCS - qgsdelimitedtextplugin.cpp - qgsdelimitedtextplugingui.cpp -) - -SET (DLTEXT_UIS qgsdelimitedtextpluginguibase.ui) - -SET (DLTEXT_MOC_HDRS - qgsdelimitedtextplugin.h - qgsdelimitedtextplugingui.h -) - -SET (DLTEXT_RCCS delimited_text.qrc) - -######################################################## -# Build - -QT4_WRAP_UI (DLTEXT_UIS_H ${DLTEXT_UIS}) - -QT4_WRAP_CPP (DLTEXT_MOC_SRCS ${DLTEXT_MOC_HDRS}) - -QT4_ADD_RESOURCES(DLTEXT_RCC_SRCS ${DLTEXT_RCCS}) - -ADD_LIBRARY (delimitedtextplugin MODULE ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTEXT_RCC_SRCS} ${DLTEXT_UIS_H}) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ../../core ../../core/raster ../../core/renderer ../../core/symbology - ../../gui - ${CMAKE_CURRENT_BINARY_DIR}/../../ui - .. -) - -TARGET_LINK_LIBRARIES(delimitedtextplugin - ${QT_LIBRARIES} - qgis_core - qgis_gui -) - - -######################################################## -# Install - -INSTALL(TARGETS delimitedtextplugin - RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} - LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) + +######################################################## +# Files + +SET (DLTEXT_SRCS + qgsdelimitedtextplugin.cpp + qgsdelimitedtextplugingui.cpp +) + +SET (DLTEXT_UIS qgsdelimitedtextpluginguibase.ui) + +SET (DLTEXT_MOC_HDRS + qgsdelimitedtextplugin.h + qgsdelimitedtextplugingui.h +) + +SET (DLTEXT_RCCS delimited_text.qrc) + +######################################################## +# Build + +QT4_WRAP_UI (DLTEXT_UIS_H ${DLTEXT_UIS}) + +QT4_WRAP_CPP (DLTEXT_MOC_SRCS ${DLTEXT_MOC_HDRS}) + +QT4_ADD_RESOURCES(DLTEXT_RCC_SRCS ${DLTEXT_RCCS}) + +ADD_LIBRARY (delimitedtextplugin MODULE ${DLTEXT_SRCS} ${DLTEXT_MOC_SRCS} ${DLTEXT_RCC_SRCS} ${DLTEXT_UIS_H}) + +INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ../../core ../../core/raster ../../core/renderer ../../core/symbology + ../../gui + ${CMAKE_CURRENT_BINARY_DIR}/../../ui + .. + ${GEOS_INCLUDE_DIR} +) + +TARGET_LINK_LIBRARIES(delimitedtextplugin + ${QT_LIBRARIES} + qgis_core +) + + +######################################################## +# Install + +INSTALL(TARGETS delimitedtextplugin + RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} + LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) diff --git a/src/plugins/geoprocessing/CMakeLists.txt b/src/plugins/geoprocessing/CMakeLists.txt index e228778fca10..60e8a234fd30 100644 --- a/src/plugins/geoprocessing/CMakeLists.txt +++ b/src/plugins/geoprocessing/CMakeLists.txt @@ -35,7 +35,6 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(pggeoprocessingplugin ${POSTGRES_LIBRARY} qgis_core - qgis_gui ) diff --git a/src/plugins/georeferencer/CMakeLists.txt b/src/plugins/georeferencer/CMakeLists.txt index d9e9597e739d..e07102fb7665 100644 --- a/src/plugins/georeferencer/CMakeLists.txt +++ b/src/plugins/georeferencer/CMakeLists.txt @@ -43,7 +43,7 @@ QT4_ADD_RESOURCES(GEOREF_RCC_SRCS ${GEOREF_RCCS}) ADD_LIBRARY (georefplugin MODULE ${GEOREF_SRCS} ${GEOREF_MOC_SRCS} ${GEOREF_RCC_SRCS} ${GEOREF_UIS_H}) INCLUDE_DIRECTORIES( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ../../core ../../raster ../../renderer ../../core/symbology ../../gui @@ -56,7 +56,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 index 6c7ddebde009..4d0d8558d8c1 100644 --- a/src/plugins/gps_importer/CMakeLists.txt +++ b/src/plugins/gps_importer/CMakeLists.txt @@ -38,7 +38,7 @@ QT4_ADD_RESOURCES(GPS_RCC_SRCS ${GPS_RCCS}) ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS} ${GPS_UIS_H}) INCLUDE_DIRECTORIES( - . + ${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ../../core ../../core/raster ../../core/renderer ../../core/symbology ../../gui @@ -50,7 +50,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 index 8d06dbff4471..f4c03d91acb9 100644 --- a/src/plugins/grass/CMakeLists.txt +++ b/src/plugins/grass/CMakeLists.txt @@ -82,7 +82,6 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(grassplugin ${QT_LIBRARIES} qgis_core - qgis_gui qgisgrass ${GRASS_LIBRARIES} ) diff --git a/src/plugins/grid_maker/CMakeLists.txt b/src/plugins/grid_maker/CMakeLists.txt index 0193087a17fb..e1d6c0d820bf 100644 --- a/src/plugins/grid_maker/CMakeLists.txt +++ b/src/plugins/grid_maker/CMakeLists.txt @@ -1,79 +1,78 @@ - -######################################################## -# Files - -SET (GRID_COMMON_SRCS - plugingui.cpp - graticulecreator.cpp - utils.c - shpopen.c - dbfopen.c -) - -SET (GRID_SRCS - plugin.cpp - ${GRID_COMMON_SRCS} -) - -SET (GRID_BINARY_SRCS - main.cpp - ${GRID_COMMON_SRCS} -) - -SET (GRID_UIS pluginguibase.ui) - -SET (GRID_COMMON_MOC_HDRS plugingui.h) - -SET (GRID_MOC_HDRS plugin.h) - -SET (GRID_RCCS gridmaker_plugin.qrc) - -######################################################## -# Build - -QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS}) - -QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS}) - -QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS}) - -QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS}) - -ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H}) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ../../core ../../core/raster ../../core/renderer ../../core/symbology - ../../gui - ${CMAKE_CURRENT_BINARY_DIR}/../../ui - .. -) - -TARGET_LINK_LIBRARIES(gridmakerplugin - ${QT_LIBRARIES} - qgis_core - qgis_gui -) - -IF (PLUGINS_ALSO_BINARIES) - - ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS}) - - TARGET_LINK_LIBRARIES(gridmaker - ${QT_LIBRARIES} - qgis_core - qgis_gui - ) - -ENDIF (PLUGINS_ALSO_BINARIES) - -######################################################## -# Install - -INSTALL(TARGETS gridmakerplugin - RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} - LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) - -IF (PLUGINS_ALSO_BINARIES) - INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR}) -ENDIF (PLUGINS_ALSO_BINARIES) + +######################################################## +# Files + +SET (GRID_COMMON_SRCS + plugingui.cpp + graticulecreator.cpp + utils.c + shpopen.c + dbfopen.c +) + +SET (GRID_SRCS + plugin.cpp + ${GRID_COMMON_SRCS} +) + +SET (GRID_BINARY_SRCS + main.cpp + ${GRID_COMMON_SRCS} +) + +SET (GRID_UIS pluginguibase.ui) + +SET (GRID_COMMON_MOC_HDRS plugingui.h) + +SET (GRID_MOC_HDRS plugin.h) + +SET (GRID_RCCS gridmaker_plugin.qrc) + +######################################################## +# Build + +QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS}) + +QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS}) + +QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS}) + +QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS}) + +ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H}) + +INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ../../core ../../core/raster ../../core/renderer ../../core/symbology + ../../gui + ${CMAKE_CURRENT_BINARY_DIR}/../../ui + .. + ${GEOS_INCLUDE_DIR} +) + +TARGET_LINK_LIBRARIES(gridmakerplugin + ${QT_LIBRARIES} + qgis_core +) + +IF (PLUGINS_ALSO_BINARIES) + + ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS}) + + TARGET_LINK_LIBRARIES(gridmaker + ${QT_LIBRARIES} + qgis_core + ) + +ENDIF (PLUGINS_ALSO_BINARIES) + +######################################################## +# Install + +INSTALL(TARGETS gridmakerplugin + RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} + LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) + +IF (PLUGINS_ALSO_BINARIES) + INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR}) +ENDIF (PLUGINS_ALSO_BINARIES) diff --git a/src/plugins/north_arrow/CMakeLists.txt b/src/plugins/north_arrow/CMakeLists.txt index 3678b38a668a..bb613256874d 100644 --- a/src/plugins/north_arrow/CMakeLists.txt +++ b/src/plugins/north_arrow/CMakeLists.txt @@ -1,50 +1,50 @@ - -######################################################## -# Files - -SET (NORTH_SRCS - plugin.cpp - plugingui.cpp -) - -SET (NORTH_UIS pluginguibase.ui) - -SET (NORTH_MOC_HDRS - plugin.h - plugingui.h -) - -SET (NORTH_RCCS northarrow_plugin.qrc) - -######################################################## -# Build - -QT4_WRAP_UI (NORTH_UIS_H ${NORTH_UIS}) - -QT4_WRAP_CPP (NORTH_MOC_SRCS ${NORTH_MOC_HDRS}) - -QT4_ADD_RESOURCES(NORTH_RCC_SRCS ${NORTH_RCCS}) - -ADD_LIBRARY (northarrowplugin MODULE ${NORTH_SRCS} ${NORTH_MOC_SRCS} ${NORTH_RCC_SRCS} ${NORTH_UIS_H}) - -INCLUDE_DIRECTORIES( - ${CMAKE_CURRENT_BINARY_DIR} - ../../core ../../core/raster ../../core/renderer ../../core/symbology - ../../gui - ${CMAKE_CURRENT_BINARY_DIR}/../../ui - .. -) - -TARGET_LINK_LIBRARIES(northarrowplugin - ${QT_LIBRARIES} - qgis_core - qgis_gui -) - - -######################################################## -# Install - -INSTALL(TARGETS northarrowplugin - RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} - LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) + +######################################################## +# Files + +SET (NORTH_SRCS + plugin.cpp + plugingui.cpp +) + +SET (NORTH_UIS pluginguibase.ui) + +SET (NORTH_MOC_HDRS + plugin.h + plugingui.h +) + +SET (NORTH_RCCS northarrow_plugin.qrc) + +######################################################## +# Build + +QT4_WRAP_UI (NORTH_UIS_H ${NORTH_UIS}) + +QT4_WRAP_CPP (NORTH_MOC_SRCS ${NORTH_MOC_HDRS}) + +QT4_ADD_RESOURCES(NORTH_RCC_SRCS ${NORTH_RCCS}) + +ADD_LIBRARY (northarrowplugin MODULE ${NORTH_SRCS} ${NORTH_MOC_SRCS} ${NORTH_RCC_SRCS} ${NORTH_UIS_H}) + +INCLUDE_DIRECTORIES( + ${CMAKE_CURRENT_BINARY_DIR} + ../../core ../../core/raster ../../core/renderer ../../core/symbology + ../../gui + ${CMAKE_CURRENT_BINARY_DIR}/../../ui + .. + ${GEOS_INCLUDE_DIR} +) + +TARGET_LINK_LIBRARIES(northarrowplugin + ${QT_LIBRARIES} + qgis_core +) + + +######################################################## +# Install + +INSTALL(TARGETS northarrowplugin + RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} + LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) diff --git a/src/plugins/scale_bar/CMakeLists.txt b/src/plugins/scale_bar/CMakeLists.txt index 8774431ecc13..aa2c0df0293c 100644 --- a/src/plugins/scale_bar/CMakeLists.txt +++ b/src/plugins/scale_bar/CMakeLists.txt @@ -33,12 +33,12 @@ INCLUDE_DIRECTORIES( ../../gui ${CMAKE_CURRENT_BINARY_DIR}/../../ui .. + ${GEOS_INCLUDE_DIR} ) TARGET_LINK_LIBRARIES(scalebarplugin ${QT_LIBRARIES} qgis_core - qgis_gui ) diff --git a/src/plugins/spit/CMakeLists.txt b/src/plugins/spit/CMakeLists.txt index e51eceb08f3a..4e4e9c30945e 100644 --- a/src/plugins/spit/CMakeLists.txt +++ b/src/plugins/spit/CMakeLists.txt @@ -68,7 +68,6 @@ TARGET_LINK_LIBRARIES(spitplugin ${POSTGRES_LIBRARY} ${GDAL_LIBRARY} qgis_core - qgis_gui ) IF (PLUGINS_ALSO_BINARIES) @@ -79,7 +78,6 @@ IF (PLUGINS_ALSO_BINARIES) ${QT_LIBRARIES} ${POSTGRES_LIBRARY} qgis_core - qgis_gui ) ENDIF (PLUGINS_ALSO_BINARIES) diff --git a/src/plugins/wfs/CMakeLists.txt b/src/plugins/wfs/CMakeLists.txt index aa96043b512d..abc6a4d7c607 100644 --- a/src/plugins/wfs/CMakeLists.txt +++ b/src/plugins/wfs/CMakeLists.txt @@ -44,7 +44,6 @@ INCLUDE_DIRECTORIES( TARGET_LINK_LIBRARIES(wfsplugin ${QT_LIBRARIES} qgis_core - qgis_gui ) diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt index de265851eb8b..dc11dc2f9176 100644 --- a/src/providers/CMakeLists.txt +++ b/src/providers/CMakeLists.txt @@ -1,5 +1,6 @@ -SUBDIRS (ogr wms delimitedtext) +#SUBDIRS (ogr wms delimitedtext) +SUBDIRS (ogr delimitedtext) IF (POSTGRES_FOUND) SUBDIRS (postgres) diff --git a/src/providers/wms/CMakeLists.txt b/src/providers/wms/CMakeLists.txt index dcd472d4b45c..85b229e367d0 100644 --- a/src/providers/wms/CMakeLists.txt +++ b/src/providers/wms/CMakeLists.txt @@ -4,7 +4,7 @@ SET (WMS_MOC_HDRS qgswmsprovider.h) QT4_WRAP_CPP (WMS_MOC_SRCS ${WMS_MOC_HDRS}) -INCLUDE_DIRECTORIES( . ../../gui ../../core ../../raster) +INCLUDE_DIRECTORIES( . ../../gui ../../raster ../../core ${SQLITE3_INCLUDE_DIR}) ADD_LIBRARY(wmsprovider MODULE ${WMS_SRCS} ${WMS_MOC_SRCS}) diff --git a/tools/mapserver_export/CMakeLists.txt b/tools/mapserver_export/CMakeLists.txt index 79efff1ab1c0..e973ee0c8da7 100644 --- a/tools/mapserver_export/CMakeLists.txt +++ b/tools/mapserver_export/CMakeLists.txt @@ -32,7 +32,6 @@ TARGET_LINK_LIBRARIES (msexport ${QT_LIBRARIES} ${PYTHON_LIBRARIES} qgis_core - qgis_gui )