Skip to content

Commit 25885b8

Browse files
committed
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+

python/ext-libs/CMakeLists.txt

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
SET (QGIS_PYTHON_DIR ${QGIS_DATA_DIR}/python)
2+
SET (PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python)
3+
4+
SET (WITH_PYSPATIALITE FALSE CACHE BOOL "Determines whether PYSPATIALITE should be built")
5+
IF (WITH_PYSPATIALITE)
6+
ADD_SUBDIRECTORY(pyspatialite)
7+
ENDIF (WITH_PYSPATIALITE)
8+
9+
MACRO(EXT_PYLIB lib)
10+
STRING(TOUPPER ${lib} ulib)
11+
SET (WITH_INTERNAL_${ulib} TRUE CACHE BOOL "Determines whether ${ulib} should be included")
12+
IF(WITH_INTERNAL_${ulib})
13+
INSTALL(DIRECTORY ${lib} DESTINATION "${QGIS_PYTHON_DIR}")
14+
15+
ADD_CUSTOM_TARGET(py${lib} ALL)
16+
FILE(GLOB_RECURSE files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR} ${lib}/*)
17+
FOREACH(file ${files})
18+
ADD_CUSTOM_COMMAND(TARGET py${lib}
19+
POST_BUILD
20+
COMMAND ${CMAKE_COMMAND} -E copy_if_different ${file} "${PYTHON_OUTPUT_DIRECTORY}/${file}"
21+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
22+
COMMENT "Copy ${file} => ${PYTHON_OUTPUT_DIRECTORY}/${file}"
23+
DEPENDS ${file}
24+
)
25+
ENDFOREACH(file)
26+
ENDIF(WITH_INTERNAL_${ulib})
27+
ENDMACRO(EXT_PYLIB lib)
28+
29+
FOREACH(pkg httplib2 jinja2 markupsafe owslib pygments dateutil pytz)
30+
EXT_PYLIB(${pkg})
31+
ENDFOREACH(pkg)
32+
33+
IF(WITH_INTERNAL_SIX)
34+
INSTALL(FILES six.py DESTINATION "${QGIS_PYTHON_DIR}")
35+
36+
ADD_CUSTOM_COMMAND(TARGET pyutils
37+
POST_BUILD
38+
COMMAND ${CMAKE_COMMAND} -E copy six.py "${PYTHON_OUTPUT_DIRECTORY}"
39+
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
40+
DEPENDS six.py
41+
)
42+
ENDIF(WITH_INTERNAL_SIX)
Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
FILE(GLOB PY_FILES *.py)
2+
3+
PLUGIN_INSTALL(processing ./httplib2 ${PY_FILES})
File renamed without changes.

0 commit comments

Comments
 (0)