diff options
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/mapnik/vcpkg.json | 8 | ||||
| -rw-r--r-- | ports/proj4/portfile.cmake | 5 | ||||
| -rw-r--r-- | ports/proj4/vcpkg.json | 22 |
3 files changed, 11 insertions, 24 deletions
diff --git a/ports/mapnik/vcpkg.json b/ports/mapnik/vcpkg.json index c6aebcc52..b9f2c7d4a 100644 --- a/ports/mapnik/vcpkg.json +++ b/ports/mapnik/vcpkg.json @@ -1,6 +1,7 @@ { "name": "mapnik", "version-date": "2021-09-15", + "port-version": 1, "description": "Mapnik is an open source toolkit for developing mapping applications.", "homepage": "https://github.com/mapnik/mapnik", "supports": "!(static & windows)", @@ -152,12 +153,7 @@ "proj": { "description": "PROJ Functionalities", "dependencies": [ - { - "name": "proj4", - "features": [ - "database" - ] - } + "proj4" ] }, "svg-renderer": { diff --git a/ports/proj4/portfile.cmake b/ports/proj4/portfile.cmake index 34fb1fd02..73a458e84 100644 --- a/ports/proj4/portfile.cmake +++ b/ports/proj4/portfile.cmake @@ -23,7 +23,6 @@ endif() vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES - database BUILD_PROJ_DATABASE tools BUILD_CCT tools BUILD_CS2CS tools BUILD_GEOD @@ -38,9 +37,7 @@ if(VCPKG_LIBRARY_LINKAGE STREQUAL "static") set(FEATURE_OPTIONS ${FEATURE_OPTIONS} -DENABLE_TIFF=OFF -DENABLE_CURL=OFF -DBUILD_PROJSYNC=OFF) endif() -if ("database" IN_LIST FEATURES) - set(EXE_SQLITE3 ${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}) -endif() +set(EXE_SQLITE3 "${CURRENT_HOST_INSTALLED_DIR}/tools/sqlite3${VCPKG_HOST_EXECUTABLE_SUFFIX}") vcpkg_cmake_configure( SOURCE_PATH ${SOURCE_PATH} diff --git a/ports/proj4/vcpkg.json b/ports/proj4/vcpkg.json index b2d12fc00..2f4972763 100644 --- a/ports/proj4/vcpkg.json +++ b/ports/proj4/vcpkg.json @@ -1,7 +1,7 @@ { "name": "proj4", "version-semver": "7.2.1", - "port-version": 5, + "port-version": 6, "description": "PROJ.4 library for cartographic projections", "homepage": "https://github.com/OSGeo/PROJ", "dependencies": [ @@ -10,6 +10,13 @@ "default-features": false }, { + "name": "sqlite3", + "host": true, + "features": [ + "tool" + ] + }, + { "name": "vcpkg-cmake", "host": true }, @@ -19,22 +26,9 @@ } ], "default-features": [ - "database", "tiff" ], "features": { - "database": { - "description": "generate database", - "dependencies": [ - { - "name": "sqlite3", - "host": true, - "features": [ - "tool" - ] - } - ] - }, "tiff": { "description": "Enable TIFF support to read some grids", "dependencies": [ |