Skip to content
Permalink
Browse files

Move QJSON detection to toplevel CMakeLists, and make it optional, di…

…sabling the arcgisrest provider if it was not found
  • Loading branch information
manisandro committed May 28, 2016
1 parent 1828563 commit ed2487deaa5bafb30f7bdf6172f1f92178e0dce7
Showing with 3 additions and 2 deletions.
  1. +1 −0 CMakeLists.txt
  2. +2 −0 src/providers/CMakeLists.txt
  3. +0 −2 src/providers/arcgisrest/CMakeLists.txt
@@ -200,6 +200,7 @@ FIND_PACKAGE(GDAL)
FIND_PACKAGE(Expat REQUIRED)
FIND_PACKAGE(Spatialindex REQUIRED)
FIND_PACKAGE(Qwt REQUIRED)
FIND_PACKAGE(QJSON)

IF (WITH_INTERNAL_QEXTSERIALPORT)
SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport)
@@ -2,7 +2,9 @@
SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})
SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_PLUGIN_SUBDIR})

IF(QJSON_FOUND AND NOT ENABLE_QT5)
ADD_SUBDIRECTORY(arcgisrest)
ENDIF(QJSON_FOUND AND NOT ENABLE_QT5)
ADD_SUBDIRECTORY(memory)
ADD_SUBDIRECTORY(ogr)
ADD_SUBDIRECTORY(wms)
@@ -1,5 +1,3 @@
FIND_PACKAGE(QJSON REQUIRED)

INCLUDE_DIRECTORIES(
../../core
../../core/auth

0 comments on commit ed2487d

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