diff --git a/CMakeLists.txt b/CMakeLists.txt index 0fe8e5a1..434c28e2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -183,17 +183,17 @@ if(APPLE) target_link_libraries(merginmapsmobilesdk PRIVATE ${LIBTASN1_LIBRARY}) endif() -target_link_libraries(merginmapsmobilesdk PRIVATE GEOS::geos_c) target_link_libraries(merginmapsmobilesdk PRIVATE libzip::zip) -target_link_libraries(merginmapsmobilesdk PRIVATE unofficial::minizip::minizip) target_link_libraries(merginmapsmobilesdk PRIVATE protobuf::libprotobuf-lite) target_link_libraries(merginmapsmobilesdk PRIVATE exiv2lib exiv2-xmp) target_link_libraries(merginmapsmobilesdk PRIVATE CURL::libcurl) target_link_libraries(merginmapsmobilesdk PRIVATE expat::expat) target_link_libraries(merginmapsmobilesdk PRIVATE WebP::webp WebP::webpdemux WebP::libwebpmux WebP::webpdecoder) target_link_libraries(merginmapsmobilesdk PRIVATE ${FREEXL_LIBRARY}) +target_link_libraries(merginmapsmobilesdk PRIVATE unofficial::minizip::minizip) target_link_libraries(merginmapsmobilesdk PRIVATE ${ZLIB_LIBRARY}) target_link_libraries(merginmapsmobilesdk PRIVATE ${SPATIALINDEX_LIBRARY}) target_link_libraries(merginmapsmobilesdk PRIVATE ${SPATIALITE_LIBRARY}) +target_link_libraries(merginmapsmobilesdk PRIVATE GEOS::geos_c) target_link_libraries(merginmapsmobilesdk PRIVATE Iconv::Iconv) target_link_libraries(merginmapsmobilesdk PRIVATE unofficial::sqlite3::sqlite3) diff --git a/vcpkg-overlay/ports/gdal/portfile.cmake b/vcpkg-overlay/ports/gdal/portfile.cmake index 81fe86d5..c6ecf6d3 100644 --- a/vcpkg-overlay/ports/gdal/portfile.cmake +++ b/vcpkg-overlay/ports/gdal/portfile.cmake @@ -46,6 +46,7 @@ list(APPEND FEATURE_OPTIONS -DGDAL_USE_POPPLER=OFF) list(APPEND FEATURE_OPTIONS -DGDAL_USE_ODBC=OFF) list(APPEND FEATURE_OPTIONS -DGDAL_USE_MSSQL_ODBC=OFF) list(APPEND FEATURE_OPTIONS -DGDAL_USE_ZSTD=OFF) +list(APPEND FEATURE_OPTIONS -DGDAL_USE_LIBKML=OFF) # Compatibility with older Android versions https://github.com/OSGeo/gdal/pull/5941 if(VCPKG_TARGET_IS_ANDROID AND ANRDOID_PLATFORM VERSION_LESS 24 AND (VCPKG_TARGET_ARCHITECTURE STREQUAL "x86" OR VCPKG_TARGET_ARCHITECTURE STREQUAL "arm")) diff --git a/vcpkg-overlay/ports/qtkeychain-qt6/portfile.cmake b/vcpkg-overlay/ports/qtkeychain-qt6/portfile.cmake index 8709e98d..2f91b38f 100644 --- a/vcpkg-overlay/ports/qtkeychain-qt6/portfile.cmake +++ b/vcpkg-overlay/ports/qtkeychain-qt6/portfile.cmake @@ -24,6 +24,7 @@ vcpkg_cmake_configure( -DBUILD_TOOLS=OFF -DWITH_nss_PLUGIN=OFF -DWITH_pkcs11_PLUGIN=OFF + -DLIBSECRET_SUPPORT=OFF ) vcpkg_cmake_install() diff --git a/vcpkg-overlay/ports/qtkeychain-qt6/vcpkg.json b/vcpkg-overlay/ports/qtkeychain-qt6/vcpkg.json index 7a802c66..0af38223 100644 --- a/vcpkg-overlay/ports/qtkeychain-qt6/vcpkg.json +++ b/vcpkg-overlay/ports/qtkeychain-qt6/vcpkg.json @@ -8,7 +8,7 @@ "dependencies": [ { "name": "libsecret", - "platform": "!(windows | uwp | osx | android | ios)" + "platform": "!(windows | uwp | osx | android | ios | linux)" }, { "name": "vcpkg-cmake",