diff options
Diffstat (limited to 'src')
| m--------- | src/3rdparty/mapbox-gl-native | 0 | ||||
| -rw-r--r-- | src/configure.cmake | 20 | ||||
| -rw-r--r-- | src/plugins/geoservices/CMakeLists.txt | 12 |
3 files changed, 23 insertions, 9 deletions
diff --git a/src/3rdparty/mapbox-gl-native b/src/3rdparty/mapbox-gl-native deleted file mode 160000 -Subproject d3101bbc22edd41c9036ea487d4a71eabd97823 diff --git a/src/configure.cmake b/src/configure.cmake index 56f950b5..0f0364a8 100644 --- a/src/configure.cmake +++ b/src/configure.cmake @@ -1,11 +1,19 @@ -# TODO: figure out if we need any condition for that. -# Previously was: "condition": "config.opengl" -qt_feature("location-labs-plugin" PRIVATE - LABEL "Provides experimental QtLocation QML types" +qt_feature("geoservices_osm" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" CONDITION TRUE ) -qt_feature("geoservices_osm" PRIVATE +qt_feature("geoservices_esri" PRIVATE LABEL "Provides access to OpenStreetMap geoservices" - CONDITION TRUE + CONDITION FALSE +) + +qt_feature("geoservices_mapbox" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" + CONDITION FALSE +) + +qt_feature("geoservices_nokia" PRIVATE + LABEL "Provides access to OpenStreetMap geoservices" + CONDITION FALSE ) diff --git a/src/plugins/geoservices/CMakeLists.txt b/src/plugins/geoservices/CMakeLists.txt index 9235f3f1..efa1e7f6 100644 --- a/src/plugins/geoservices/CMakeLists.txt +++ b/src/plugins/geoservices/CMakeLists.txt @@ -1,7 +1,13 @@ -add_subdirectory(esri) add_subdirectory(itemsoverlay) -add_subdirectory(mapbox) -add_subdirectory(nokia) if(QT_FEATURE_geoservices_osm) add_subdirectory(osm) endif() +if(QT_FEATURE_geoservices_esri) + add_subdirectory(esri) +endif() +if(QT_FEATURE_geoservices_mapbox) + add_subdirectory(mapbox) +endif() +if(QT_FEATURE_geoservices_nokia) + add_subdirectory(nokia) +endif() |