Skip to content

Commit

Permalink
linux sdk fixes: qt6keychain, libkml, linking order
Browse files Browse the repository at this point in the history
qt6keychain on linux was using libsecret which had the issue that
it was using system libsecret instead of the one from vcpkg, but
we do not really need it anyway - and we can then also skip linking
to Glib which was causing frequent crashes upon app start for me.

app build was then failing when trying to link to libkml, which
is not included in our build, so now it is explicitly disabled
in gdal's portfile (should not be a problem because there's another
KML driver for gdal/ogr that does not rely on libkml).

the linking order for the sdk test was slightly incorrect for
geos and minizip, giving me link errors (spatialite needs geos,
freexl needs minizip)
  • Loading branch information
wonder-sk committed Mar 11, 2024
1 parent 642b54c commit 3446ac9
Show file tree
Hide file tree
Showing 4 changed files with 5 additions and 3 deletions.
4 changes: 2 additions & 2 deletions CMakeLists.txt
Expand Up @@ -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)
1 change: 1 addition & 0 deletions vcpkg-overlay/ports/gdal/portfile.cmake
Expand Up @@ -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"))
Expand Down
1 change: 1 addition & 0 deletions vcpkg-overlay/ports/qtkeychain-qt6/portfile.cmake
Expand Up @@ -24,6 +24,7 @@ vcpkg_cmake_configure(
-DBUILD_TOOLS=OFF
-DWITH_nss_PLUGIN=OFF
-DWITH_pkcs11_PLUGIN=OFF
-DLIBSECRET_SUPPORT=OFF
)

vcpkg_cmake_install()
Expand Down
2 changes: 1 addition & 1 deletion vcpkg-overlay/ports/qtkeychain-qt6/vcpkg.json
Expand Up @@ -8,7 +8,7 @@
"dependencies": [
{
"name": "libsecret",
"platform": "!(windows | uwp | osx | android | ios)"
"platform": "!(windows | uwp | osx | android | ios | linux)"
},
{
"name": "vcpkg-cmake",
Expand Down

0 comments on commit 3446ac9

Please sign in to comment.