Skip to content

Commit

Permalink
Add new CMake option: WITH_INTERNAL_HTTPLIB (default True)
Browse files Browse the repository at this point in the history
If set to False, you have to make sure that the httplib2 package
is available on the target platform

Fix #9618
  • Loading branch information
m-kuhn committed Mar 11, 2014
1 parent 60e1a9b commit be8ae5f
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 3 deletions.
2 changes: 2 additions & 0 deletions CMakeLists.txt
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
@@ -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
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

0 comments on commit be8ae5f

Please sign in to comment.