Skip to content

Commit f2717b8

Browse files
author
jef
committed
fix windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk@13269 c8812cc2-4d05-0410-92ff-de0c093fc19c
1 parent cc9bfab commit f2717b8

File tree

4 files changed

+37
-25
lines changed

4 files changed

+37
-25
lines changed

python/CMakeLists.txt

+6-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,11 @@
1-
21
SUBDIRS(plugins)
32

3+
IF (WITH_INTERNAL_SPATIALITE)
4+
INCLUDE_DIRECTORIES(
5+
../src/core/spatialite/headers
6+
../src/core/spatialite/headers/spatialite
7+
)
8+
ENDIF (WITH_INTERNAL_SPATIALITE)
49

510
INCLUDE_DIRECTORIES(
611
${PYTHON_INCLUDE_PATH}

src/app/CMakeLists.txt

+16-11
Original file line numberDiff line numberDiff line change
@@ -317,9 +317,6 @@ INCLUDE_DIRECTORIES(
317317
${CMAKE_CURRENT_BINARY_DIR}
318318
${CMAKE_CURRENT_BINARY_DIR}/../ui
319319
${QT_QTUITOOLS_INCLUDE_DIR}
320-
${PROJ_INCLUDE_DIR}
321-
${GEOS_INCLUDE_DIR}
322-
${GDAL_INCLUDE_DIR}
323320
../core
324321
../core/gps ../core/gps/qextserialport
325322
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
@@ -330,19 +327,27 @@ INCLUDE_DIRECTORIES(
330327
gps/qwtpolar
331328
)
332329

333-
IF (POSTGRES_FOUND)
334-
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
335-
ENDIF (POSTGRES_FOUND)
336-
337330
IF (HAVE_SPATIALITE)
338-
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
339-
340-
IF (NOT WITH_INTERNAL_SPATIALITE)
331+
IF (WITH_INTERNAL_SPATIALITE)
332+
INCLUDE_DIRECTORIES(../core/spatialite/headers)
333+
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
334+
ELSE (WITH_INTERNAL_SPATIALITE)
335+
INCLUDE_DIRECTORIES(${SPATIALITE_INCLUDE_DIR})
341336
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
342337
ADD_DEFINITIONS(-DEXTERNAL_SPATIALITE)
343-
ENDIF (NOT WITH_INTERNAL_SPATIALITE)
338+
ENDIF (WITH_INTERNAL_SPATIALITE)
344339
ENDIF (HAVE_SPATIALITE)
345340

341+
INCLUDE_DIRECTORIES(
342+
${PROJ_INCLUDE_DIR}
343+
${GEOS_INCLUDE_DIR}
344+
${GDAL_INCLUDE_DIR}
345+
)
346+
347+
IF (POSTGRES_FOUND)
348+
INCLUDE_DIRECTORIES(${POSTGRES_INCLUDE_DIR})
349+
ENDIF (POSTGRES_FOUND)
350+
346351
#############
347352

348353
IF (WIN32)

src/app/qgsspatialitesourceselect.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525

2626
extern "C"
2727
{
28-
#include <spatialite/sqlite3.h>
28+
#include <sqlite3.h>
2929
}
3030

3131
#include <QThread>

src/gui/CMakeLists.txt

+14-12
Original file line numberDiff line numberDiff line change
@@ -95,25 +95,27 @@ qgsprojectbadlayerguihandler.h
9595
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
9696

9797
INCLUDE_DIRECTORIES(
98-
${QT_QTUITOOLS_INCLUDE_DIR}
99-
${CMAKE_CURRENT_SOURCE_DIR}
100-
${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
101-
../core
102-
../core/composer
103-
../core/raster
104-
../core/renderer
105-
../core/symbology
106-
../core/symbology-ng
107-
${CMAKE_CURRENT_BINARY_DIR}
108-
${CMAKE_CURRENT_BINARY_DIR}/../ui
109-
${GEOS_INCLUDE_DIR}
98+
${QT_QTUITOOLS_INCLUDE_DIR}
99+
${CMAKE_CURRENT_SOURCE_DIR}
100+
${CMAKE_CURRENT_SOURCE_DIR}/symbology-ng
101+
../core
102+
../core/composer
103+
../core/raster
104+
../core/renderer
105+
../core/symbology
106+
../core/symbology-ng
107+
${CMAKE_CURRENT_BINARY_DIR}
108+
${CMAKE_CURRENT_BINARY_DIR}/../ui
110109
)
111110
IF (WITH_INTERNAL_SPATIALITE)
111+
INCLUDE_DIRECTORIES(../core/spatialite/headers)
112112
INCLUDE_DIRECTORIES(../core/spatialite/headers/spatialite)
113113
ELSE (WITH_INTERNAL_SPATIALITE)
114114
INCLUDE_DIRECTORIES(${SQLITE3_INCLUDE_DIR})
115115
ENDIF (WITH_INTERNAL_SPATIALITE)
116116

117+
INCLUDE_DIRECTORIES(${GEOS_INCLUDE_DIR})
118+
117119
IF (WIN32)
118120
IF (MSVC)
119121
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllexport)")

0 commit comments

Comments
 (0)