From b0aaf631a7d028a6625ff217dd3ce912493b51e7 Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Mon, 20 Nov 2023 02:04:41 +0100 Subject: [PATCH] Update to upstream OpenGL 2 branch of MapLibre Native --- src/core/CMakeLists.txt | 8 +++++++- vendor/maplibre-native | 2 +- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index cdc79ea..9370a26 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -111,7 +111,6 @@ target_link_libraries( Qt${QT_VERSION_MAJOR}::Network PRIVATE $ - $ $ $ ) @@ -122,6 +121,13 @@ if(NOT MLN_QT_WITH_INTERNAL_SQLITE) Qt${QT_VERSION_MAJOR}::Sql ) endif() +foreach(target ${MLN_QT_VENDOR_LIBRARIES}) + target_link_libraries( + Core + PRIVATE + $ + ) +endforeach() # Apple specifics if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin") diff --git a/vendor/maplibre-native b/vendor/maplibre-native index 85c0ab7..2b87bd9 160000 --- a/vendor/maplibre-native +++ b/vendor/maplibre-native @@ -1 +1 @@ -Subproject commit 85c0ab7e5145213194b2a4b73997f10fab1d1cd8 +Subproject commit 2b87bd9eb30ed8567c4a1dfb8a9c690a5464151a