Merge pull request #1235 from m-kuhn/httplib

Add new CMake option: WITH_INTERNAL_HTTPLIB (default True)
qgis · Mar 26, 2014 · 36bd2d0 · 36bd2d0
2 parents a93bef4 + be8ae5f
commit 36bd2d0
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -70,6 +70,8 @@ IF(WITH_INTERNAL_SPATIALITE)
   ENDIF(WIN32 OR APPLE OR CYGWIN)
 ENDIF (WITH_INTERNAL_SPATIALITE)
 
+SET (WITH_INTERNAL_HTTPLIB TRUE CACHE BOOL "Use internal httplib2")
+
 SET (WITH_ORACLE FALSE CACHE BOOL "Determines whether Oracle support should be built")
 IF(WITH_ORACLE)
   SET(HAVE_ORACLE TRUE)

diff --git a/python/plugins/processing/admintools/CMakeLists.txt b/python/plugins/processing/admintools/CMakeLists.txt
@@ -1,6 +1,8 @@
 FILE(GLOB PY_FILES *.py)
 
 ADD_SUBDIRECTORY(geoserver)
-ADD_SUBDIRECTORY(httplib2)
+IF(WITH_INTERNAL_HTTPLIB) 
+  ADD_SUBDIRECTORY(httplib2)
+ENDIF(WITH_INTERNAL_HTTPLIB) 
 
-PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
+PLUGIN_INSTALL(processing ./admintools ${PY_FILES})
diff --git a/python/plugins/processing/admintools/geoserver/catalog.py b/python/plugins/processing/admintools/geoserver/catalog.py
@@ -41,7 +41,10 @@
     UnsavedLayerGroup
 from processing.admintools.geoserver.workspace import workspace_from_index, \
     Workspace
-from processing.admintools import httplib2
+try:
+  from processing.admintools import httplib2
+except ImportError:
+  import httplib2
 
 
 logger = logging.getLogger('gsconfig.catalog')