diff --git a/CMakeLists.txt b/CMakeLists.txt index b6bf520149bd..8eec102c100e 100644 --- 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 index c63c512ec788..a4768a4a3a13 100644 --- 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 index efc30e1e83df..9b7aa0050111 100644 --- 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