sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-02-23 00:02:38 -05:00
Code Issues Packages Projects Releases Wiki Activity

fix debian builds

Browse Source
This commit is contained in:
Juergen E. Fischer 2013-03-02 18:23:05 +01:00
parent 160a5c4727
commit 95bcc7f449
4 changed files with 34 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
debian/qgis-providers.install.in vendored
View File

@ -5,7 +5,6 @@ usr/lib/qgis/plugins/libgpxprovider.so
usr/lib/qgis/plugins/libmemoryprovider.so
usr/lib/qgis/plugins/libmssqlprovider.so
usr/lib/qgis/plugins/libogrprovider.so
usr/lib/qgis/plugins/libosmprovider.so
usr/lib/qgis/plugins/libowsprovider.so
usr/lib/qgis/plugins/libpostgresprovider.so
usr/lib/qgis/plugins/libspatialiteprovider.so

50
src/analysis/CMakeLists.txt
View File

@ -37,12 +37,31 @@ SET(QGIS_ANALYSIS_SRCS
vector/qgsgeometryanalyzer.cpp
vector/qgszonalstatistics.cpp
vector/qgsoverlayanalyzer.cpp
openstreetmap/qgsosmbase.cpp
openstreetmap/qgsosmdatabase.cpp
openstreetmap/qgsosmdownload.cpp
openstreetmap/qgsosmimport.cpp
)
IF(HAVE_SPATIALITE)
SET(QGIS_ANALYSIS_SRCS ${QGIS_ANALYSIS_SRCS}
openstreetmap/qgsosmbase.cpp
openstreetmap/qgsosmdatabase.cpp
openstreetmap/qgsosmdownload.cpp
openstreetmap/qgsosmimport.cpp
)
SET(QGIS_ANALYSIS_MOC_HDRS
openstreetmap/qgsosmdownload.h
openstreetmap/qgsosmimport.h
)
IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../core/spatialite/headers)
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
ENDIF (WITH_INTERNAL_SPATIALITE)
ENDIF(HAVE_SPATIALITE)
INCLUDE_DIRECTORIES(BEFORE raster)
ADD_FLEX_FILES_PREFIX(QGIS_ANALYSIS_SRCS raster raster/qgsrastercalclexer.ll)
@ -67,11 +86,6 @@ IF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
)
ENDIF ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
SET(QGIS_ANALYSIS_MOC_HDRS
openstreetmap/qgsosmdownload.h
openstreetmap/qgsosmimport.h
)
QT4_WRAP_CPP(QGIS_ANALYSIS_MOC_SRCS ${QGIS_ANALYSIS_MOC_HDRS})
# install headers
@ -91,12 +105,17 @@ SET(QGIS_ANALYSIS_HDRS
interpolation/qgsgridfilewriter.h
interpolation/qgsidwinterpolator.h
interpolation/qgstininterpolator.h
openstreetmap/qgsosmbase.h
openstreetmap/qgsosmdatabase.h
openstreetmap/qgsosmdownload.h
openstreetmap/qgsosmimport.h
)
IF(HAVE_SPATIALITE)
SET(QGIS_ANALYSIS_HDRS ${QGIS_ANALYSIS_HDRS}
openstreetmap/qgsosmbase.h
openstreetmap/qgsosmdatabase.h
openstreetmap/qgsosmdownload.h
openstreetmap/qgsosmimport.h
)
ENDIF(HAVE_SPATIALITE)
INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/../core/
@ -107,7 +126,6 @@ INCLUDE_DIRECTORIES(
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
${SPATIALITE_INCLUDE_DIR}
)
IF (WIN32)
@ -148,8 +166,8 @@ IF (NOT ANDROID)
)
ENDIF (NOT ANDROID)
ADD_DEPENDENCIES(qgis_analysis qgis_core)
TARGET_LINK_LIBRARIES(qgis_analysis qgis_core ${SQLITE3_LIBRARY} )
TARGET_LINK_LIBRARIES(qgis_analysis qgis_core)
# install

4
src/app/CMakeLists.txt
View File

@ -493,10 +493,6 @@ IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
ENDIF(WIN32)
IF(NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${SQLITE_LIBRARY})
ENDIF(NOT WITH_INTERNAL_SPATIALITE)
IF (APPLE)
TARGET_LINK_LIBRARIES(${QGIS_APP_NAME} ${APP_SERVICES_LIBRARY} )

4
src/gui/CMakeLists.txt
View File

@ -365,10 +365,6 @@ TARGET_LINK_LIBRARIES(qgis_gui
#${QT_QTTEST_LIBRARY} # for ModelTest
)
IF (NOT WITH_INTERNAL_SPATIALITE)
TARGET_LINK_LIBRARIES(qgis_gui ${SQLITE3_LIBRARIES})
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
IF(WIN32)
ADD_DEFINITIONS(-DQWT_DLL)
ENDIF(WIN32)