Skip to content

Commit 25885b8

Browse files
jef-njef-n
committedMay 17, 2014
move internal python extensions to common directory and fix metasearch install
1 parent f89b2cc commit 25885b8

File tree

848 files changed

+62
-27
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

848 files changed

+62
-27
lines changed
 

‎CMakeLists.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar")
6060
SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport")
6161

6262
SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally")
63-
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
6463
SET (WITH_QSPATIALITE FALSE CACHE BOOL "Determines whether QSPATIALITE sql driver should be built")
6564
IF(WITH_INTERNAL_SPATIALITE)
6665
SET(SPATIALITE_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/spatialite/headers)
@@ -70,8 +69,6 @@ IF(WITH_INTERNAL_SPATIALITE)
7069
ENDIF(WIN32 OR APPLE OR CYGWIN)
7170
ENDIF (WITH_INTERNAL_SPATIALITE)
7271

73-
SET (WITH_INTERNAL_HTTPLIB TRUE CACHE BOOL "Use internal httplib2")
74-
7572
SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
7673
IF(WITH_ORACLE)
7774
SET(HAVE_ORACLE TRUE)

‎python/CMakeLists.txt

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
1-
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
1+
SET(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
22

33
ADD_SUBDIRECTORY(plugins)
44
ADD_SUBDIRECTORY(qsci_apis)
55
ADD_SUBDIRECTORY(console)
66
ADD_SUBDIRECTORY(pyplugin_installer)
7-
8-
IF (WITH_PYSPATIALITE)
9-
ADD_SUBDIRECTORY(pyspatialite)
10-
ENDIF (WITH_PYSPATIALITE)
7+
ADD_SUBDIRECTORY(ext-libs)
118

129
IF (WITH_INTERNAL_SPATIALITE)
1310
INCLUDE_DIRECTORIES(
@@ -205,3 +202,4 @@ IF(WITH_PY_COMPILE)
205202
DEPENDS pyutils
206203
)
207204
ENDIF(WITH_PY_COMPILE)
205+

0 commit comments

Comments
 (0)