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

fix windows build

Browse Source 
git-svn-id: http://svn.osgeo.org/qgis/trunk@13269 c8812cc2-4d05-0410-92ff-de0c093fc19c
This commit is contained in:
jef 2010-04-06 22:25:12 +00:00
parent cc9bfabbc1
commit f2717b806f
4 changed files with 38 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
python/CMakeLists.txt
View File

@ -1,6 +1,11 @@
SUBDIRS(plugins) SUBDIRS(plugins)
IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(
../src/core/spatialite/headers
../src/core/spatialite/headers/spatialite
)
ENDIF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${PYTHON_INCLUDE_PATH} ${PYTHON_INCLUDE_PATH}

29
src/app/CMakeLists.txt
View File

@ -317,9 +317,6 @@ INCLUDE_DIRECTORIES(
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui ${CMAKE_CURRENT_BINARY_DIR}/../ui
${QT_QTUITOOLS_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR}
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
../core ../core
../core/gps ../core/gps/qextserialport ../core/gps ../core/gps/qextserialport
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng ../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
@ -330,19 +327,27 @@ INCLUDE_DIRECTORIES(
gps/qwtpolar gps/qwtpolar
) )
IF (HAVE_SPATIALITE)
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(
${PROJ_INCLUDE_DIR}
${GEOS_INCLUDE_DIR}
${GDAL_INCLUDE_DIR}
)
IF (POSTGRES_FOUND) IF (POSTGRES_FOUND)
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
ENDIF (POSTGRES_FOUND) ENDIF (POSTGRES_FOUND)
IF (HAVE_SPATIALITE)
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
IF (NOT WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
ENDIF (HAVE_SPATIALITE)
############# #############
IF (WIN32) IF (WIN32)

2
src/app/qgsspatialitesourceselect.h
View File

@ -25,7 +25,7 @@
extern "C" extern "C"
{ {
#include <spatialite/sqlite3.h> #include <sqlite3.h>
} }
#include <QThread> #include <QThread>

26
src/gui/CMakeLists.txt
View File

@ -95,25 +95,27 @@ qgsprojectbadlayerguihandler.h
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS}) QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
INCLUDE_DIRECTORIES( INCLUDE_DIRECTORIES(
${QT_QTUITOOLS_INCLUDE_DIR} ${QT_QTUITOOLS_INCLUDE_DIR}
${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng ${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
../core ../core
../core/composer ../core/composer
../core/raster ../core/raster
../core/renderer ../core/renderer
../core/symbology ../core/symbology
../core/symbology-ng ../core/symbology-ng
${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_BINARY_DIR}
${CMAKE_CURRENT_BINARY_DIR}/../ui ${CMAKE_CURRENT_BINARY_DIR}/../ui
${GEOS_INCLUDE_DIR}
) )
IF (WITH_INTERNAL_SPATIALITE) IF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(../core/spatialite/headers)
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite) INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
ELSE (WITH_INTERNAL_SPATIALITE) ELSE (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR}) INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
ENDIF (WITH_INTERNAL_SPATIALITE) ENDIF (WITH_INTERNAL_SPATIALITE)
INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
IF (WIN32) IF (WIN32)
IF (MSVC) IF (MSVC)
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)") ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")