File tree 4 files changed +37
-25
lines changed
4 files changed +37
-25
lines changed Original file line number Diff line number Diff line change 1
-
2
1
SUBDIRS (plugins)
3
2
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)
4
9
5
10
INCLUDE_DIRECTORIES (
6
11
${PYTHON_INCLUDE_PATH}
Original file line number Diff line number Diff line change @@ -317,9 +317,6 @@ INCLUDE_DIRECTORIES(
317
317
${CMAKE_CURRENT_BINARY_DIR}
318
318
${CMAKE_CURRENT_BINARY_DIR} /../ui
319
319
${QT_QTUITOOLS_INCLUDE_DIR}
320
- ${PROJ_INCLUDE_DIR}
321
- ${GEOS_INCLUDE_DIR}
322
- ${GDAL_INCLUDE_DIR}
323
320
../core
324
321
../core/gps ../core/gps/qextserialport
325
322
../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
@@ -330,19 +327,27 @@ INCLUDE_DIRECTORIES(
330
327
gps/qwtpolar
331
328
)
332
329
333
- IF (POSTGRES_FOUND)
334
- INCLUDE_DIRECTORIES (${POSTGRES_INCLUDE_DIR} )
335
- ENDIF (POSTGRES_FOUND)
336
-
337
330
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} )
341
336
INCLUDE_DIRECTORIES (${SQLITE3_INCLUDE_DIR} )
342
337
ADD_DEFINITIONS (-DEXTERNAL_SPATIALITE)
343
- ENDIF (NOT WITH_INTERNAL_SPATIALITE)
338
+ ENDIF (WITH_INTERNAL_SPATIALITE)
344
339
ENDIF (HAVE_SPATIALITE)
345
340
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
+
346
351
#############
347
352
348
353
IF (WIN32 )
Original file line number Diff line number Diff line change 25
25
26
26
extern " C"
27
27
{
28
- #include < spatialite/ sqlite3.h>
28
+ #include < sqlite3.h>
29
29
}
30
30
31
31
#include < QThread>
Original file line number Diff line number Diff line change @@ -95,25 +95,27 @@ qgsprojectbadlayerguihandler.h
95
95
QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS} )
96
96
97
97
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
110
109
)
111
110
IF (WITH_INTERNAL_SPATIALITE)
111
+ INCLUDE_DIRECTORIES (../core/spatialite/headers)
112
112
INCLUDE_DIRECTORIES (../core/spatialite/headers/spatialite)
113
113
ELSE (WITH_INTERNAL_SPATIALITE)
114
114
INCLUDE_DIRECTORIES (${SQLITE3_INCLUDE_DIR} )
115
115
ENDIF (WITH_INTERNAL_SPATIALITE)
116
116
117
+ INCLUDE_DIRECTORIES (${GEOS_INCLUDE_DIR} )
118
+
117
119
IF (WIN32 )
118
120
IF (MSVC )
119
121
ADD_DEFINITIONS ("-DGUI_EXPORT=__declspec(dllexport)" )
You can’t perform that action at this time.
0 commit comments