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

…sabling the arcgisrest provider if it was not found
qgis · Jun 2, 2016 · ed2487deaa5bafb30f7bdf6172f1f92178e0dce7 · ed2487d
1 parent 1828563
commit ed2487deaa5bafb30f7bdf6172f1f92178e0dce7
Unified Split

Showing with 3 additions and 2 deletions.

+1 −0 CMakeLists.txt

+2 −0 src/providers/CMakeLists.txt

+0 −2 src/providers/arcgisrest/CMakeLists.txt
diff --git a/CMakeLists.txt b/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)

diff --git a/src/providers/CMakeLists.txt b/src/providers/CMakeLists.txt
@@ -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)

diff --git a/src/providers/arcgisrest/CMakeLists.txt b/src/providers/arcgisrest/CMakeLists.txt
@@ -1,5 +1,3 @@
-FIND_PACKAGE(QJSON REQUIRED)
-
 INCLUDE_DIRECTORIES(
   ../../core
   ../../core/auth