From 4b33e39d8345fc75464b264a2c4f1b530eeb4b4b Mon Sep 17 00:00:00 2001 From: Tadej Novak Date: Sun, 29 Oct 2023 19:02:13 +0100 Subject: [PATCH] Improve handling of system ICU on Linux --- .github/workflows/Linux.yml | 3 +-- README.md | 8 ++++++++ vendor/maplibre-native | 2 +- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml index ed4c210..a13670d 100644 --- a/.github/workflows/Linux.yml +++ b/.github/workflows/Linux.yml @@ -128,8 +128,7 @@ jobs: -DCMAKE_BUILD_TYPE="RelWithDebInfo" \ -DCMAKE_C_COMPILER_LAUNCHER="ccache" \ -DCMAKE_CXX_COMPILER_LAUNCHER="ccache" \ - -DCMAKE_INSTALL_PREFIX="../install" \ - -DMLN_QT_WITH_INTERNAL_ICU=ON + -DCMAKE_INSTALL_PREFIX="../install" ninja ninja install diff --git a/README.md b/README.md index b0c610c..f9284d0 100644 --- a/README.md +++ b/README.md @@ -28,6 +28,14 @@ ninja ninja install ``` +### Linux + +Note that when using the system ICU library standalone Qt installation using +installer is ignored. If you want to use that you need to make sure that your +system ICU is not too new as it may prevent your app from running on older +versions of Linux. Alternatively you can use internally bundled ICU with the +`-DMLN_QT_WITH_INTERNAL_ICU=ON` CMake option. + ### macOS Add the following arguments to the CMake call: diff --git a/vendor/maplibre-native b/vendor/maplibre-native index bbbd576..13b17c9 160000 --- a/vendor/maplibre-native +++ b/vendor/maplibre-native @@ -1 +1 @@ -Subproject commit bbbd576e06cde77a1a01ee0c5ea041a20b73fe17 +Subproject commit 13b17c9d824e72d43e35bc6448c75350099c5401