Skip to content
Permalink
Browse files

Merge pull request #1235 from m-kuhn/httplib

Add new CMake option: WITH_INTERNAL_HTTPLIB (default True)
  • Loading branch information
volaya committed Mar 26, 2014
2 parents a93bef4 + be8ae5f commit 36bd2d000adf091c23680070bd7cadce165fa7d2
@@ -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)
@@ -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})
@@ -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')

0 comments on commit 36bd2d0

Please sign in to comment.
You can’t perform that action at this time.