From 5efeeb1080f763be5abd911254b7ae7e1d1f84bb Mon Sep 17 00:00:00 2001
From: Dan Paulat <dpaulat@gmail.com>
Date: Sat, 2 Mar 2024 00:57:43 -0600
Subject: [PATCH] Add maplibre-native submodule for greater flexibility of
 versioning

---
 .gitmodules                       | 3 +++
 external/maplibre-native          | 1 +
 external/maplibre-native-qt.cmake | 3 ++-
 3 files changed, 6 insertions(+), 1 deletion(-)
 create mode 160000 external/maplibre-native

diff --git a/.gitmodules b/.gitmodules
index f1e7fbbd..adb166fa 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -34,3 +34,6 @@
 [submodule "external/maplibre-native-qt"]
 	path = external/maplibre-native-qt
 	url = https://github.com/maplibre/maplibre-native-qt.git
+[submodule "external/maplibre-native"]
+	path = external/maplibre-native
+	url = https://github.com/maplibre/maplibre-native.git
diff --git a/external/maplibre-native b/external/maplibre-native
new file mode 160000
index 00000000..4fff8a5d
--- /dev/null
+++ b/external/maplibre-native
@@ -0,0 +1 @@
+Subproject commit 4fff8a5d33852c7bc4c5d8c989092eb42769a71d
diff --git a/external/maplibre-native-qt.cmake b/external/maplibre-native-qt.cmake
index aef6de7b..aae9d40b 100644
--- a/external/maplibre-native-qt.cmake
+++ b/external/maplibre-native-qt.cmake
@@ -5,6 +5,7 @@ set(gtest_disable_pthreads ON)
 set(MLN_WITH_QT ON)
 set(MLN_QT_WITH_INTERNAL_ICU ON)
 set(MLN_QT_WITH_LOCATION OFF)
+set(MLN_CORE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native)
 add_subdirectory(maplibre-native-qt)
 
 find_package(ZLIB)
@@ -23,7 +24,7 @@ else()
     target_compile_options(Core PRIVATE "$<$<CONFIG:Release>:-g>")
 endif()
 
-set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native-qt/vendor/maplibre-native/include
+set(MLN_INCLUDE_DIRS ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native/include
                      ${CMAKE_CURRENT_SOURCE_DIR}/maplibre-native-qt/src/core/include
                      ${CMAKE_CURRENT_BINARY_DIR}/maplibre-native-qt/src/core/include PARENT_SCOPE)