Showing with 10 additions and 3 deletions.
  1. +2 −0 CMakeLists.txt
  2. +4 −2 python/plugins/processing/admintools/CMakeLists.txt
  3. +4 −1 python/plugins/processing/admintools/geoserver/catalog.py
2 changes: 2 additions & 0 deletions CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down
6 changes: 4 additions & 2 deletions python/plugins/processing/admintools/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
@@ -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})
5 changes: 4 additions & 1 deletion python/plugins/processing/admintools/geoserver/catalog.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down