sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-14 00:07:35 -04:00
Code Issues Packages Projects Releases Wiki Activity

Move QJSON detection to toplevel CMakeLists, and make it optional, disabling the arcgisrest provider if it was not found

Browse Source
This commit is contained in:
Sandro Mani 2016-05-28 17:36:39 +02:00
parent 1828563331
commit ed2487deaa
3 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@ -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
src/providers/CMakeLists.txt
View File

@ -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)

2
src/providers/arcgisrest/CMakeLists.txt
View File

@ -1,5 +1,3 @@
FIND_PACKAGE(QJSON REQUIRED)
INCLUDE_DIRECTORIES(
../../core
../../core/auth