From b29e22a7f9bb65915ca09d7668d7960563d39695 Mon Sep 17 00:00:00 2001
From: Bart Louwers <bart@emeel.net>
Date: Wed, 14 May 2025 23:04:05 +0200
Subject: [PATCH] Improve core static build release (#3465)

---
 .github/workflows/core-release.yml | 11 ++++++++---
 CMakePresets.json                  |  6 ++++--
 vendor/nunicode.cmake              |  2 +-
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/core-release.yml b/.github/workflows/core-release.yml
index 3000d4a70..60757b457 100644
--- a/.github/workflows/core-release.yml
+++ b/.github/workflows/core-release.yml
@@ -12,9 +12,14 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
-      - name: Create maplibre-native-headers.tar.gz
-        run: tar czf maplibre-native-headers.tar.gz include
+        with:
+          submodules: recursive
 
+      - name: Create maplibre-native-headers.tar.gz
+        run: tar czf maplibre-native-headers.tar.gz \
+          include \
+          vendor/maplibre-native-base/deps/variant/include \
+          vendor/maplibre-native-base/deps/geometry.hpp/include
       - name: Create Release
         run: |
           gh release create core-${{ github.sha }} \
@@ -22,7 +27,7 @@ jobs:
             --prerelease=false \
             --latest=false \
             --title "core-${{ github.sha }}" \
-            maplibre-native-headers.tar.gz
+            maplibre-native-headers.tar.gz LICENSE.core.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
 
diff --git a/CMakePresets.json b/CMakePresets.json
index 9ae3b4980..64509e2b1 100644
--- a/CMakePresets.json
+++ b/CMakePresets.json
@@ -107,7 +107,8 @@
       "name": "linux-opengl-core",
       "inherits": "linux-opengl",
       "cacheVariables": {
-        "MLN_CORE_INCLUDE_DEPS": "ON"
+        "MLN_CORE_INCLUDE_DEPS": "ON",
+        "MLN_USE_BUILTIN_ICU": "ON"
       }
     },
     {
@@ -124,7 +125,8 @@
       "name": "linux-vulkan-core",
       "inherits": "linux-vulkan",
       "cacheVariables": {
-        "MLN_CORE_INCLUDE_DEPS": "ON"
+        "MLN_CORE_INCLUDE_DEPS": "ON",
+        "MLN_USE_BUILTIN_ICU": "ON"
       }
     }
   ],
diff --git a/vendor/nunicode.cmake b/vendor/nunicode.cmake
index 640539bb1..0ecda14dd 100644
--- a/vendor/nunicode.cmake
+++ b/vendor/nunicode.cmake
@@ -2,7 +2,7 @@ if(TARGET mbgl-vendor-nunicode)
     return()
 endif()
 
-if(MLN_WITH_QT)
+if(MLN_WITH_QT OR MLN_CORE_INCLUDE_DEPS)
     add_library(mbgl-vendor-nunicode OBJECT)
 else()
     add_library(mbgl-vendor-nunicode STATIC)