Skip to content

Commit 56f38aa

Browse files
committed
Merge branch 'master' of github.com:qgis/Quantum-GIS
2 parents d3f5eb2 + dabd59b commit 56f38aa

File tree

3 files changed

+10
-5
lines changed

3 files changed

+10
-5
lines changed

CMakeLists.txt

+1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,7 @@ SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support shou
6161

6262
IF (WITH_SPATIALITE)
6363
SET (WITH_INTERNAL_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
64+
SET (WITH_PYSPATIALITE TRUE CACHE BOOL "Determines whether PYSPATIALITE should be built")
6465
IF(WITH_INTERNAL_SPATIALITE)
6566
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
6667
SET(HAVE_SPATIALITE TRUE)

python/CMakeLists.txt

+3-2
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,17 @@ ADD_SUBDIRECTORY(plugins)
33
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
44
SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis)
55

6-
IF (WITH_INTERNAL_SPATIALITE)
6+
IF (WITH_PYSPATIALITE)
77
ADD_SUBDIRECTORY(pyspatialite)
8+
ENDIF (WITH_PYSPATIALITE)
89

10+
IF (WITH_INTERNAL_SPATIALITE)
911
INCLUDE_DIRECTORIES(
1012
../src/core/spatialite/headers
1113
../src/core/spatialite/headers/spatialite
1214
)
1315
ENDIF (WITH_INTERNAL_SPATIALITE)
1416

15-
1617
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
1718
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY})
1819

python/pyspatialite/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,14 @@
11
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
22
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/pyspatialite)
33

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

511
INCLUDE_DIRECTORIES(
6-
../../src/core/spatialite/headers
7-
../../src/core/spatialite/headers/spatialite
8-
912
${PYTHON_INCLUDE_PATH}
1013
${GEOS_INCLUDE_DIR}
1114
${PROJ_INCLUDE_DIR}

0 commit comments

Comments
 (0)