diff --git a/platform/qt/qt.cmake b/platform/qt/qt.cmake index 47ec22933..e1fa27e0a 100644 --- a/platform/qt/qt.cmake +++ b/platform/qt/qt.cmake @@ -153,6 +153,8 @@ target_link_libraries( $ $ $ + $ + $ $<$:$> $<$,$>>:z> $,$,Qt${QT_VERSION_MAJOR}::Sql> @@ -179,6 +181,8 @@ if(MLN_QT_HAS_PARENT) mbgl-vendor-parsedate mbgl-vendor-nunicode mbgl-vendor-csscolorparser + mlt-cpp + fastpfor-lib $<$:mbgl-vendor-filesystem> $<$:mbgl-vendor-sqlite> $<$,$>:mbgl-vendor-icu> diff --git a/vendor/maplibre-tile-spec b/vendor/maplibre-tile-spec index d457bf2b0..751ebb183 160000 --- a/vendor/maplibre-tile-spec +++ b/vendor/maplibre-tile-spec @@ -1 +1 @@ -Subproject commit d457bf2b0135ecf718b9d8a1bea7e6fa5be2713e +Subproject commit 751ebb1837e4fd03c9074b91fce24727013c1868 diff --git a/vendor/maplibre-tile-spec.cmake b/vendor/maplibre-tile-spec.cmake index b653a351d..58c39e9a0 100644 --- a/vendor/maplibre-tile-spec.cmake +++ b/vendor/maplibre-tile-spec.cmake @@ -2,9 +2,8 @@ set(MLT_WITH_JSON OFF CACHE BOOL "No JSON support" FORCE) set(MLT_WITH_PROTOZERO OFF CACHE BOOL "No protozero" FORCE) set(MLT_WITH_TESTS OFF CACHE BOOL "Google Test conflicts with Dawn") set(MLT_WITH_TOOLS OFF CACHE BOOL "Not used") - -# This is set by the platform CMakeLists.txt after vendor libraries. If it was set earlier, we could just use it. -set(CMAKE_OSX_DEPLOYMENT_TARGET 14.3) -set(MLT_OSX_DEPLOYMENT_TARGET ${CMAKE_OSX_DEPLOYMENT_TARGET} CACHE STRING "Inherited MacOS/iOS target" FORCE) +if(MLN_WITH_QT) + set(MLT_AS_OBJECT_LIBRARY ON CACHE BOOL "Build as object library" FORCE) +endif() add_subdirectory(${PROJECT_SOURCE_DIR}/vendor/maplibre-tile-spec/cpp SYSTEM)