Skip to content
Permalink
Browse files
Reformatted text and fixed application icon suport under msvc
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@7238 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
timlinux committed Oct 1, 2007
1 parent 5de4821 commit c77fc37f06b5d5764720d480e2c23ee0613f8ad6
Showing with 160 additions and 168 deletions.
  1. +160 −168 src/app/CMakeLists.txt
@@ -2,148 +2,148 @@
# TODO: delete qgsvectorsymbologywidget.cpp and qgsvectorsymbologywidget.h from SVN

SET(QGIS_APP_SRCS
main.cpp
qgisapp.cpp
qgisappinterface.cpp
qgsabout.cpp
qgsaddattrdialog.cpp
qgsattributeactiondialog.cpp
qgsattributedialog.cpp
qgsattributetable.cpp
qgsattributetabledisplay.cpp
qgsbookmarkitem.cpp
qgsbookmarks.cpp
qgsclipboard.cpp
qgscontinuouscolordialog.cpp
qgscustomprojectiondialog.cpp
qgsdelattrdialog.cpp
qgsfillstylewidget.cpp
qgsgeomtypedialog.cpp
qgsgraduatedsymboldialog.cpp
qgshelpviewer.cpp
qgsidentifyresults.cpp
qgslabeldialog.cpp
qgslinestyledialog.cpp
qgslinestylewidget.cpp
qgsludialog.cpp
qgsmaptooladdfeature.cpp
qgsmaptooladdisland.cpp
qgsmaptooladdring.cpp
qgsmaptoolcapture.cpp
qgsmaptoolidentify.cpp
qgsmaptoolselect.cpp
qgsmaptoolvertexedit.cpp
qgsmarkerdialog.cpp
qgsmeasuredialog.cpp
qgsmeasuretool.cpp
qgsnewhttpconnection.cpp
qgsnumericsortlistviewitem.cpp
qgsoptions.cpp
qgspastetransformations.cpp
qgspatterndialog.cpp
qgspluginitem.cpp
qgspluginmanager.cpp
qgspluginmetadata.cpp
qgspluginregistry.cpp
qgspointstylewidget.cpp
qgsprojectproperties.cpp
qgsrasterlayerproperties.cpp
qgssearchquerybuilder.cpp
qgsserversourceselect.cpp
qgssinglesymboldialog.cpp
qgsuniquevaluedialog.cpp
qgsvectorlayerproperties.cpp

composer/qgscomposer.cpp
composer/qgscomposeritem.cpp
composer/qgscomposerlabel.cpp
composer/qgscomposerpicture.cpp
composer/qgscomposermap.cpp
composer/qgscomposerscalebar.cpp
composer/qgscomposervectorlegend.cpp
composer/qgscomposerview.cpp
composer/qgscomposition.cpp

legend/qgslegendgroup.cpp
legend/qgslegend.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
)
main.cpp
qgisapp.cpp
qgisappinterface.cpp
qgsabout.cpp
qgsaddattrdialog.cpp
qgsattributeactiondialog.cpp
qgsattributedialog.cpp
qgsattributetable.cpp
qgsattributetabledisplay.cpp
qgsbookmarkitem.cpp
qgsbookmarks.cpp
qgsclipboard.cpp
qgscontinuouscolordialog.cpp
qgscustomprojectiondialog.cpp
qgsdelattrdialog.cpp
qgsfillstylewidget.cpp
qgsgeomtypedialog.cpp
qgsgraduatedsymboldialog.cpp
qgshelpviewer.cpp
qgsidentifyresults.cpp
qgslabeldialog.cpp
qgslinestyledialog.cpp
qgslinestylewidget.cpp
qgsludialog.cpp
qgsmaptooladdfeature.cpp
qgsmaptooladdisland.cpp
qgsmaptooladdring.cpp
qgsmaptoolcapture.cpp
qgsmaptoolidentify.cpp
qgsmaptoolselect.cpp
qgsmaptoolvertexedit.cpp
qgsmarkerdialog.cpp
qgsmeasuredialog.cpp
qgsmeasuretool.cpp
qgsnewhttpconnection.cpp
qgsnumericsortlistviewitem.cpp
qgsoptions.cpp
qgspastetransformations.cpp
qgspatterndialog.cpp
qgspluginitem.cpp
qgspluginmanager.cpp
qgspluginmetadata.cpp
qgspluginregistry.cpp
qgspointstylewidget.cpp
qgsprojectproperties.cpp
qgsrasterlayerproperties.cpp
qgssearchquerybuilder.cpp
qgsserversourceselect.cpp
qgssinglesymboldialog.cpp
qgsuniquevaluedialog.cpp
qgsvectorlayerproperties.cpp

composer/qgscomposer.cpp
composer/qgscomposeritem.cpp
composer/qgscomposerlabel.cpp
composer/qgscomposerpicture.cpp
composer/qgscomposermap.cpp
composer/qgscomposerscalebar.cpp
composer/qgscomposervectorlegend.cpp
composer/qgscomposerview.cpp
composer/qgscomposition.cpp

legend/qgslegendgroup.cpp
legend/qgslegend.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_APP_MOC_HDRS

qgisapp.h
qgisappinterface.h
qgsabout.h
qgsaddattrdialog.h
qgsattributeactiondialog.h
qgsattributedialog.h
qgsattributetabledisplay.h
qgsattributetable.h
qgsbookmarks.h
qgscontinuouscolordialog.h
qgscustomprojectiondialog.h
qgsdelattrdialog.h
qgsfillstylewidget.h
qgsgeomtypedialog.h
qgsgraduatedsymboldialog.h
qgshelpviewer.h
qgsidentifyresults.h
qgslabeldialog.h
qgslinestyledialog.h
qgslinestylewidget.h
qgsludialog.h
qgsmaplayerinterface.h
qgsmaptoolidentify.h
qgsmarkerdialog.h
qgsmeasuredialog.h
qgsnewhttpconnection.h
qgsoptions.h
qgspastetransformations.h
qgspatterndialog.h
qgspluginmanager.h
qgspointstylewidget.h
qgsprojectproperties.h
qgsrasterlayerproperties.h
qgssearchquerybuilder.h
qgsserversourceselect.h
qgssinglesymboldialog.h
qgsuniquevaluedialog.h
qgsvectorlayerproperties.h

composer/qgscomposer.h
composer/qgscomposerlabel.h
composer/qgscomposerpicture.h
composer/qgscomposermap.h
composer/qgscomposerscalebar.h
composer/qgscomposervectorlegend.h
composer/qgscomposerview.h
composer/qgscomposition.h

legend/qgslegend.h
legend/qgslegendlayer.h
legend/qgslegendlayerfile.h
)
qgisapp.h
qgisappinterface.h
qgsabout.h
qgsaddattrdialog.h
qgsattributeactiondialog.h
qgsattributedialog.h
qgsattributetabledisplay.h
qgsattributetable.h
qgsbookmarks.h
qgscontinuouscolordialog.h
qgscustomprojectiondialog.h
qgsdelattrdialog.h
qgsfillstylewidget.h
qgsgeomtypedialog.h
qgsgraduatedsymboldialog.h
qgshelpviewer.h
qgsidentifyresults.h
qgslabeldialog.h
qgslinestyledialog.h
qgslinestylewidget.h
qgsludialog.h
qgsmaplayerinterface.h
qgsmaptoolidentify.h
qgsmarkerdialog.h
qgsmeasuredialog.h
qgsnewhttpconnection.h
qgsoptions.h
qgspastetransformations.h
qgspatterndialog.h
qgspluginmanager.h
qgspointstylewidget.h
qgsprojectproperties.h
qgsrasterlayerproperties.h
qgssearchquerybuilder.h
qgsserversourceselect.h
qgssinglesymboldialog.h
qgsuniquevaluedialog.h
qgsvectorlayerproperties.h

composer/qgscomposer.h
composer/qgscomposerlabel.h
composer/qgscomposerpicture.h
composer/qgscomposermap.h
composer/qgscomposerscalebar.h
composer/qgscomposervectorlegend.h
composer/qgscomposerview.h
composer/qgscomposition.h

legend/qgslegend.h
legend/qgslegendlayer.h
legend/qgslegendlayerfile.h
)

IF (POSTGRES_FOUND)
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS}
qgsdbsourceselect.cpp
qgsnewconnection.cpp
qgspgquerybuilder.cpp
)
qgsdbsourceselect.cpp
qgsnewconnection.cpp
qgspgquerybuilder.cpp
)
SET (QGIS_APP_MOC_HDRS ${QGIS_APP_MOC_HDRS}
qgsdbsourceselect.h
qgsnewconnection.h
qgspgquerybuilder.h
)
qgsdbsourceselect.h
qgsnewconnection.h
qgspgquerybuilder.h
)
ENDIF (POSTGRES_FOUND)

# Python support
@@ -156,55 +156,47 @@ QT4_WRAP_CPP(QGIS_APP_MOC_SRCS ${QGIS_APP_MOC_HDRS})



IF (WIN32 AND NOT MSVC)
IF (WIN32)

IF (MSVC)
SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc)
ELSE(MSVC)

# Icon for windows
# Note: can't include .rc directly to source files
# as it's ignored when used MinGW
# Icon for windows MINGW
# Note: can't include .rc directly to source files
# as it's ignored when used MinGW

IF (NOT WINDRES)
FIND_PROGRAM(WINDRES windres)
IF (NOT WINDRES)
MESSAGE(FATAL_ERROR "windres not found - aborting")
FIND_PROGRAM(WINDRES windres)
IF (NOT WINDRES)
MESSAGE(FATAL_ERROR "windres not found - aborting")
ENDIF (NOT WINDRES)
ENDIF (NOT WINDRES)
ENDIF (NOT WINDRES)



#############################################################
# application icon
IF( MINGW )
#############################################################
# application icon
# resource compilation for MinGW
ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/icon.o
COMMAND ${WINDRES} -I${CMAKE_CURRENT_SOURCE_DIR} -i${CMAKE_CURRENT_SOURCE_DIR}/qgis_win32.rc
-o ${CMAKE_CURRENT_BINARY_DIR}/icon.o )
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_BINARY_DIR}/icon.o)
ELSE( MINGW )
SET(QGIS_APP_SRCS ${QGIS_APP_SRCS} icon.rc)
ENDIF( MINGW )

ENDIF (WIN32 AND NOT MSVC)
ENDIF (MSVC)
ENDIF (WIN32)

# This is the right way to include icon in MSVC but currently
# it ends with error that qgis_win322.ico is old DIB and it has to be converted
#IF (MSVC)
# SET (QGIS_APP_SRCS ${QGIS_APP_SRCS} ${CMAKE_CURRENT_SOURCE_DIR}/../qgis_win32.rc)
#ENDIF (MSVC)


INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR} composer legend
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
../core
../core/raster ../core/renderer ../core/symbology
../gui
../plugins
${CMAKE_CURRENT_SOURCE_DIR} composer legend
${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui
../core
../core/raster ../core/renderer ../core/symbology
../gui
../plugins
${PROJ_INCLUDE_DIR}
${SQLITE3_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)
)

IF (POSTGRES_FOUND)
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
@@ -222,12 +214,12 @@ TARGET_LINK_LIBRARIES(qgis
${QT_LIBRARIES}
qgis_core
qgis_gui
)
)

SET_TARGET_PROPERTIES(qgis PROPERTIES
INSTALL_RPATH ${CMAKE_INSTALL_PREFIX}/lib
INSTALL_RPATH_USE_LINK_PATH true
)
)

IF (PYTHON_FOUND)
TARGET_LINK_LIBRARIES(qgis ${PYTHON_LIBRARIES})

0 comments on commit c77fc37

Please sign in to comment.