mirror of
https://github.com/qgis/QGIS.git
synced 2025-02-25 00:58:06 -05:00
Include paths ending with a '.' didn't work on my Win2k sp4, so I replaced any reference in INCLUDE_DIRECTORIES to '.' with ${CMAKE_CURRENT_SOURCEDIR}
git-svn-id: http://svn.osgeo.org/qgis/trunk@6459 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
homann
parent
afd03dc425
commit
69eb9c44aa
@ -179,7 +179,7 @@ ENDIF (WIN32)
|
||||
|
||||
|
||||
INCLUDE_DIRECTORIES(
|
||||
. composer legend
|
||||
${CMAKE_CURRENT_SOURCE_DIR} composer legend
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}/../ui
|
||||
../core
|
||||
|
||||
@ -1,158 +1,158 @@
|
||||
|
||||
|
||||
#############################################################
|
||||
# sources
|
||||
|
||||
SET(QGIS_CORE_SRCS
|
||||
qgis.cpp
|
||||
qgsapplication.cpp
|
||||
qgsattributeaction.cpp
|
||||
qgsclipper.cpp
|
||||
qgscontexthelp.cpp
|
||||
qgscoordinatetransform.cpp
|
||||
qgsdatasourceuri.cpp
|
||||
qgsdistancearea.cpp
|
||||
qgsexception.cpp
|
||||
qgsfeature.cpp
|
||||
qgsfeatureattribute.cpp
|
||||
qgsfield.cpp
|
||||
qgsgeometry.cpp
|
||||
qgsgeometryvertexindex.cpp
|
||||
qgshttptransaction.cpp
|
||||
qgslabel.cpp
|
||||
qgslabelattributes.cpp
|
||||
qgsline.cpp
|
||||
qgslogger.cpp
|
||||
qgsmaplayer.cpp
|
||||
qgsmaplayerregistry.cpp
|
||||
qgsmaprender.cpp
|
||||
qgsmaptopixel.cpp
|
||||
qgsmessageoutput.cpp
|
||||
qgspoint.cpp
|
||||
qgsproject.cpp
|
||||
qgsprojectproperty.cpp
|
||||
qgsprovidercountcalcevent.cpp
|
||||
qgsproviderextentcalcevent.cpp
|
||||
qgsprovidermetadata.cpp
|
||||
qgsproviderregistry.cpp
|
||||
qgsrasterdataprovider.cpp
|
||||
qgsrect.cpp
|
||||
qgsrunprocess.cpp
|
||||
qgsscalecalculator.cpp
|
||||
qgssearchstring.cpp
|
||||
qgssearchtreenode.cpp
|
||||
qgsspatialrefsys.cpp
|
||||
qgsvectordataprovider.cpp
|
||||
qgsvectorfilewriter.cpp
|
||||
qgsvectorlayer.cpp
|
||||
|
||||
raster/qgscolortable.cpp
|
||||
raster/qgsrasterlayer.cpp
|
||||
|
||||
renderer/qgscontinuouscolorrenderer.cpp
|
||||
renderer/qgsgraduatedsymbolrenderer.cpp
|
||||
renderer/qgsrangerenderitem.cpp
|
||||
renderer/qgsrenderer.cpp
|
||||
renderer/qgsrenderitem.cpp
|
||||
renderer/qgssinglesymbolrenderer.cpp
|
||||
renderer/qgsuniquevaluerenderer.cpp
|
||||
|
||||
symbology/qgslinesymbol.cpp
|
||||
symbology/qgsmarkercatalogue.cpp
|
||||
symbology/qgsmarkersymbol.cpp
|
||||
symbology/qgspolygonsymbol.cpp
|
||||
symbology/qgssymbol.cpp
|
||||
symbology/qgssymbologyutils.cpp
|
||||
|
||||
spatialindex/qgsspatialindex.cpp
|
||||
)
|
||||
|
||||
ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
|
||||
|
||||
ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy)
|
||||
|
||||
SET(QGIS_CORE_MOC_HDRS
|
||||
qgscontexthelp.h
|
||||
qgscoordinatetransform.h
|
||||
qgsdataprovider.h
|
||||
qgshttptransaction.h
|
||||
qgsmaplayer.h
|
||||
qgsmaplayerregistry.h
|
||||
qgsmaprender.h
|
||||
qgsmessageoutput.h
|
||||
qgsproject.h
|
||||
qgsrasterdataprovider.h
|
||||
qgsrunprocess.h
|
||||
qgsvectorlayer.h
|
||||
|
||||
raster/qgsrasterlayer.h
|
||||
)
|
||||
|
||||
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
|
||||
|
||||
INCLUDE_DIRECTORIES(. raster renderer symbology
|
||||
${QT_QTSVG_INCLUDE_DIR}
|
||||
${PROJ_INCLUDE_DIR}
|
||||
${SQLITE3_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
IF (WIN32)
|
||||
IF (MSVC)
|
||||
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
|
||||
ELSE (MSVC)
|
||||
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllexport)\"")
|
||||
ENDIF (MSVC)
|
||||
ENDIF (WIN32)
|
||||
|
||||
#############################################################
|
||||
# spatial indexing library
|
||||
|
||||
# add path prefix to every specified file
|
||||
MACRO(PATH_PREFIX OUTPUT PREFIX)
|
||||
FOREACH(F ${ARGN})
|
||||
SET(${OUTPUT} ${${OUTPUT}} ${PREFIX}/${F})
|
||||
ENDFOREACH(F)
|
||||
ENDMACRO(PATH_PREFIX)
|
||||
|
||||
# tools library
|
||||
PATH_PREFIX(TOOLS_SRC tools ExternalSort.cc ExternalSort.h TemporaryFile.cc Tools.cc)
|
||||
PATH_PREFIX(GEOM_SRC geometry LineSegment.cc Point.cc Region.cc)
|
||||
|
||||
# spatial index library
|
||||
PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
|
||||
PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
|
||||
PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
|
||||
|
||||
INCLUDE_DIRECTORIES(spatialindex/include)
|
||||
|
||||
SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
|
||||
|
||||
PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})
|
||||
|
||||
#############################################################
|
||||
# qgis_core library
|
||||
|
||||
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
|
||||
|
||||
# make sure to create qgssvnversion.h before compiling
|
||||
ADD_DEPENDENCIES(qgis_core svnversion)
|
||||
|
||||
# because of htonl
|
||||
IF (WIN32)
|
||||
SET(PLATFORM_LIBRARIES wsock32)
|
||||
ENDIF (WIN32)
|
||||
|
||||
TARGET_LINK_LIBRARIES(qgis_core
|
||||
${QT_LIBRARIES} ${QT_QTSVG_LIBRARY}
|
||||
${PROJ_LIBRARY}
|
||||
${SQLITE3_LIBRARY}
|
||||
${GEOS_LIBRARY}
|
||||
${GDAL_LIBRARY}
|
||||
${PLATFORM_LIBRARIES}
|
||||
)
|
||||
|
||||
INSTALL(TARGETS qgis_core
|
||||
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
||||
LIBRARY DESTINATION lib)
|
||||
|
||||
|
||||
#############################################################
|
||||
# sources
|
||||
|
||||
SET(QGIS_CORE_SRCS
|
||||
qgis.cpp
|
||||
qgsapplication.cpp
|
||||
qgsattributeaction.cpp
|
||||
qgsclipper.cpp
|
||||
qgscontexthelp.cpp
|
||||
qgscoordinatetransform.cpp
|
||||
qgsdatasourceuri.cpp
|
||||
qgsdistancearea.cpp
|
||||
qgsexception.cpp
|
||||
qgsfeature.cpp
|
||||
qgsfeatureattribute.cpp
|
||||
qgsfield.cpp
|
||||
qgsgeometry.cpp
|
||||
qgsgeometryvertexindex.cpp
|
||||
qgshttptransaction.cpp
|
||||
qgslabel.cpp
|
||||
qgslabelattributes.cpp
|
||||
qgsline.cpp
|
||||
qgslogger.cpp
|
||||
qgsmaplayer.cpp
|
||||
qgsmaplayerregistry.cpp
|
||||
qgsmaprender.cpp
|
||||
qgsmaptopixel.cpp
|
||||
qgsmessageoutput.cpp
|
||||
qgspoint.cpp
|
||||
qgsproject.cpp
|
||||
qgsprojectproperty.cpp
|
||||
qgsprovidercountcalcevent.cpp
|
||||
qgsproviderextentcalcevent.cpp
|
||||
qgsprovidermetadata.cpp
|
||||
qgsproviderregistry.cpp
|
||||
qgsrasterdataprovider.cpp
|
||||
qgsrect.cpp
|
||||
qgsrunprocess.cpp
|
||||
qgsscalecalculator.cpp
|
||||
qgssearchstring.cpp
|
||||
qgssearchtreenode.cpp
|
||||
qgsspatialrefsys.cpp
|
||||
qgsvectordataprovider.cpp
|
||||
qgsvectorfilewriter.cpp
|
||||
qgsvectorlayer.cpp
|
||||
|
||||
raster/qgscolortable.cpp
|
||||
raster/qgsrasterlayer.cpp
|
||||
|
||||
renderer/qgscontinuouscolorrenderer.cpp
|
||||
renderer/qgsgraduatedsymbolrenderer.cpp
|
||||
renderer/qgsrangerenderitem.cpp
|
||||
renderer/qgsrenderer.cpp
|
||||
renderer/qgsrenderitem.cpp
|
||||
renderer/qgssinglesymbolrenderer.cpp
|
||||
renderer/qgsuniquevaluerenderer.cpp
|
||||
|
||||
symbology/qgslinesymbol.cpp
|
||||
symbology/qgsmarkercatalogue.cpp
|
||||
symbology/qgsmarkersymbol.cpp
|
||||
symbology/qgspolygonsymbol.cpp
|
||||
symbology/qgssymbol.cpp
|
||||
symbology/qgssymbologyutils.cpp
|
||||
|
||||
spatialindex/qgsspatialindex.cpp
|
||||
)
|
||||
|
||||
ADD_FLEX_FILES(QGIS_CORE_SRCS qgssearchstringlexer.ll)
|
||||
|
||||
ADD_BISON_FILES(QGIS_CORE_SRCS qgssearchstringparser.yy)
|
||||
|
||||
SET(QGIS_CORE_MOC_HDRS
|
||||
qgscontexthelp.h
|
||||
qgscoordinatetransform.h
|
||||
qgsdataprovider.h
|
||||
qgshttptransaction.h
|
||||
qgsmaplayer.h
|
||||
qgsmaplayerregistry.h
|
||||
qgsmaprender.h
|
||||
qgsmessageoutput.h
|
||||
qgsproject.h
|
||||
qgsrasterdataprovider.h
|
||||
qgsrunprocess.h
|
||||
qgsvectorlayer.h
|
||||
|
||||
raster/qgsrasterlayer.h
|
||||
)
|
||||
|
||||
QT4_WRAP_CPP(QGIS_CORE_MOC_SRCS ${QGIS_CORE_MOC_HDRS})
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} raster renderer symbology
|
||||
${QT_QTSVG_INCLUDE_DIR}
|
||||
${PROJ_INCLUDE_DIR}
|
||||
${SQLITE3_INCLUDE_DIR}
|
||||
${GEOS_INCLUDE_DIR}
|
||||
${GDAL_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
IF (WIN32)
|
||||
IF (MSVC)
|
||||
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllexport)")
|
||||
ELSE (MSVC)
|
||||
ADD_DEFINITIONS("-UCORE_EXPORT \"-DCORE_EXPORT=__declspec(dllexport)\"")
|
||||
ENDIF (MSVC)
|
||||
ENDIF (WIN32)
|
||||
|
||||
#############################################################
|
||||
# spatial indexing library
|
||||
|
||||
# add path prefix to every specified file
|
||||
MACRO(PATH_PREFIX OUTPUT PREFIX)
|
||||
FOREACH(F ${ARGN})
|
||||
SET(${OUTPUT} ${${OUTPUT}} ${PREFIX}/${F})
|
||||
ENDFOREACH(F)
|
||||
ENDMACRO(PATH_PREFIX)
|
||||
|
||||
# tools library
|
||||
PATH_PREFIX(TOOLS_SRC tools ExternalSort.cc ExternalSort.h TemporaryFile.cc Tools.cc)
|
||||
PATH_PREFIX(GEOM_SRC geometry LineSegment.cc Point.cc Region.cc)
|
||||
|
||||
# spatial index library
|
||||
PATH_PREFIX(SPINDEX_SRC spatialindex SpatialIndexImpl.cc)
|
||||
PATH_PREFIX(STMAN_SRC storagemanager Buffer.cc DiskStorageManager.cc MemoryStorageManager.cc RandomEvictionsBuffer.cc)
|
||||
PATH_PREFIX(RTREE_SRC rtree BulkLoader.cc Index.cc Leaf.cc Node.cc RTree.cc Statistics.cc)
|
||||
|
||||
INCLUDE_DIRECTORIES(spatialindex/include)
|
||||
|
||||
SET(SPINDEX_SRC ${TOOLS_SRC} ${GEOM_SRC} ${SPINDEX_SRC} ${STMAN_SRC} ${RTREE_SRC})
|
||||
|
||||
PATH_PREFIX(INDEX_SRC spatialindex ${SPINDEX_SRC})
|
||||
|
||||
#############################################################
|
||||
# qgis_core library
|
||||
|
||||
ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
|
||||
|
||||
# make sure to create qgssvnversion.h before compiling
|
||||
ADD_DEPENDENCIES(qgis_core svnversion)
|
||||
|
||||
# because of htonl
|
||||
IF (WIN32)
|
||||
SET(PLATFORM_LIBRARIES wsock32)
|
||||
ENDIF (WIN32)
|
||||
|
||||
TARGET_LINK_LIBRARIES(qgis_core
|
||||
${QT_LIBRARIES} ${QT_QTSVG_LIBRARY}
|
||||
${PROJ_LIBRARY}
|
||||
${SQLITE3_LIBRARY}
|
||||
${GEOS_LIBRARY}
|
||||
${GDAL_LIBRARY}
|
||||
${PLATFORM_LIBRARIES}
|
||||
)
|
||||
|
||||
INSTALL(TARGETS qgis_core
|
||||
RUNTIME DESTINATION ${QGIS_BIN_DIR}
|
||||
LIBRARY DESTINATION lib)
|
||||
|
||||
@ -31,7 +31,7 @@ qgsprojectionselector.h
|
||||
|
||||
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
|
||||
|
||||
INCLUDE_DIRECTORIES(. ../core
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../core
|
||||
../core/raster ../core/renderer ../core/symbology
|
||||
${SQLITE3_INCLUDE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
|
||||
@ -1,46 +1,46 @@
|
||||
|
||||
########################################################
|
||||
# Files
|
||||
|
||||
SET (HELP_SRCS
|
||||
main.cpp
|
||||
qgshelpserver.cpp
|
||||
qgshelpviewer.cpp
|
||||
)
|
||||
|
||||
SET (HELP_UIS qgshelpviewerbase.ui)
|
||||
|
||||
SET (HELP_MOC_HDRS
|
||||
qgshelpserver.h
|
||||
qgshelpviewer.h
|
||||
)
|
||||
|
||||
#SET (HELP_RCCS qgsgps_plugin.qrc)
|
||||
|
||||
|
||||
########################################################
|
||||
# Build
|
||||
|
||||
QT4_WRAP_UI (HELP_UIS_H ${HELP_UIS})
|
||||
|
||||
QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
|
||||
|
||||
#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
|
||||
|
||||
ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
|
||||
|
||||
INCLUDE_DIRECTORIES(.
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${SQLITE3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
${QT_LIBRARIES}
|
||||
${SQLITE3_LIBRARY}
|
||||
)
|
||||
|
||||
|
||||
########################################################
|
||||
# Install
|
||||
|
||||
INSTALL(TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
|
||||
|
||||
########################################################
|
||||
# Files
|
||||
|
||||
SET (HELP_SRCS
|
||||
main.cpp
|
||||
qgshelpserver.cpp
|
||||
qgshelpviewer.cpp
|
||||
)
|
||||
|
||||
SET (HELP_UIS qgshelpviewerbase.ui)
|
||||
|
||||
SET (HELP_MOC_HDRS
|
||||
qgshelpserver.h
|
||||
qgshelpviewer.h
|
||||
)
|
||||
|
||||
#SET (HELP_RCCS qgsgps_plugin.qrc)
|
||||
|
||||
|
||||
########################################################
|
||||
# Build
|
||||
|
||||
QT4_WRAP_UI (HELP_UIS_H ${HELP_UIS})
|
||||
|
||||
QT4_WRAP_CPP (HELP_MOC_SRCS ${HELP_MOC_HDRS})
|
||||
|
||||
#QT4_ADD_RESOURCES(HELP_RCC_SRCS ${HELP_RCCS})
|
||||
|
||||
ADD_EXECUTABLE (qgis_help MACOSX_BUNDLE ${HELP_SRCS} ${HELP_MOC_SRCS} ${HELP_UIS_H})
|
||||
|
||||
INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}
|
||||
${CMAKE_CURRENT_BINARY_DIR}
|
||||
${SQLITE3_INCLUDE_DIR}
|
||||
)
|
||||
|
||||
TARGET_LINK_LIBRARIES(qgis_help
|
||||
${QT_LIBRARIES}
|
||||
${SQLITE3_LIBRARY}
|
||||
)
|
||||
|
||||
|
||||
########################################################
|
||||
# Install
|
||||
|
||||
INSTALL(TARGETS qgis_help RUNTIME DESTINATION ${QGIS_BIN_DIR})
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user