[libosmscout] Fix features and add qt feature (#32023)

* [libosmscout] Fix features and add qt feature

* format vcpkg.json

* update version

* codes clean up

* update version
This commit is contained in:
Lily Wang 2023-06-16 20:38:42 -07:00 committed by GitHub
parent fbc868ee5e
commit 9e629f0221
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 26 additions and 20 deletions

View File

@ -6,20 +6,13 @@ vcpkg_from_github(
HEAD_REF master
)
if(VCPKG_TARGET_IS_WINDOWS OR VCPKG_TARGET_IS_UWP)
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
cairo OSMDCOUT_BUILD_MAP_CAIRO
directx OSMDCOUT_BUILD_MAP_DIRECTX
gdi OSMDCOUT_BUILD_MAP_GDI
svg OSMDCOUT_BUILD_MAP_SVG
)
else()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
cairo OSMDCOUT_BUILD_MAP_CAIRO
svg OSMDCOUT_BUILD_MAP_SVG
)
list(APPEND FEATURE_OPTIONS -DOSMDCOUT_BUILD_MAP_DIRECTX=OFF -DOSMDCOUT_BUILD_MAP_GDI=OFF)
endif()
vcpkg_check_features(OUT_FEATURE_OPTIONS FEATURE_OPTIONS FEATURES
cairo OSMSCOUT_BUILD_MAP_CAIRO
directx OSMSCOUT_BUILD_MAP_DIRECTX
gdi OSMSCOUT_BUILD_MAP_GDI
svg OSMSCOUT_BUILD_MAP_SVG
qt OSMSCOUT_BUILD_MAP_QT
)
vcpkg_cmake_configure(
SOURCE_PATH "${SOURCE_PATH}"
@ -34,7 +27,6 @@ vcpkg_cmake_configure(
-DOSMSCOUT_BUILD_TOOL_STYLEEDITOR=OFF
-DOSMSCOUT_BUILD_EXTERN_MATLAB=OFF
-DOSMSCOUT_BUILD_TESTS=OFF
-DOSMDCOUT_BUILD_MAP_QT=OFF
${FEATURE_OPTIONS}
)
@ -42,7 +34,7 @@ vcpkg_cmake_install()
vcpkg_copy_tools(TOOL_NAMES Import AUTO_CLEAN)
vcpkg_cmake_config_fixup(CONFIG_PATH share/cmake/libosmscout)
file(INSTALL "${SOURCE_PATH}/LICENSE" DESTINATION "${CURRENT_PACKAGES_DIR}/share/${PORT}" RENAME copyright)
vcpkg_install_copyright(FILE_LIST "${SOURCE_PATH}/LICENSE")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/include")
file(REMOVE_RECURSE "${CURRENT_PACKAGES_DIR}/debug/share")

View File

@ -1,7 +1,7 @@
{
"name": "libosmscout",
"version": "1.1.1",
"port-version": 2,
"port-version": 3,
"description": "libosmscout offers applications simple, high-level interfaces for offline location and POI lokup, rendering and routing functionalities based on OpenStreetMap (OSM) data.",
"homepage": "http://libosmscout.sourceforge.net/",
"documentation": "http://libosmscout.sourceforge.net/documentation/",
@ -33,10 +33,19 @@
]
},
"directx": {
"description": "Direct2D backend renderer"
"description": "Direct2D backend renderer",
"supports": "windows"
},
"gdi": {
"description": "GDI+ backend renderer"
"description": "GDI+ backend renderer",
"supports": "windows"
},
"qt": {
"description": "Enable build of Qt map drawing backend",
"dependencies": [
"qt5-base",
"qt5-svg"
]
},
"svg": {
"description": "SVG backend renderer",

View File

@ -4394,7 +4394,7 @@
},
"libosmscout": {
"baseline": "1.1.1",
"port-version": 2
"port-version": 3
},
"libp7-baical": {
"baseline": "replaced",

View File

@ -1,5 +1,10 @@
{
"versions": [
{
"git-tree": "6a036a2f5b16cbc586266834abfe3c7a3f712c7e",
"version": "1.1.1",
"port-version": 3
},
{
"git-tree": "4a9ab34b9b12105e070411d8be66aeb3a1baf246",
"version": "1.1.1",