From 748a1f4fc583384d2f339543e9d5f80524eae2b7 Mon Sep 17 00:00:00 2001 From: Tabby Cromarty Date: Wed, 29 Oct 2025 20:11:57 +0000 Subject: [PATCH 1/3] Use system ICU and curl by default on Linux --- CMakePresets.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index 348177b2..a172f0d0 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -84,7 +84,9 @@ "generator": "Ninja", "warnings": {"dev": true, "deprecated": true}, "cacheVariables": { - "CMAKE_BUILD_TYPE": "RelWithDebInfo" + "CMAKE_BUILD_TYPE": "RelWithDebInfo", + "USE_SYSTEM_CURL": true, + "USE_SYSTEM_ICU": true } }, { From 82c3801f499d53570e7079304b1ee60cf5b6ee5f Mon Sep 17 00:00:00 2001 From: Tabby Cromarty Date: Wed, 29 Oct 2025 20:26:38 +0000 Subject: [PATCH 2/3] Add curl, icu, onnx and vulkan apt dependencies --- .github/scripts/.Aptfile | 3 +++ CMakeLists.txt | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/scripts/.Aptfile b/.github/scripts/.Aptfile index 1cee24c7..01a512ec 100644 --- a/.github/scripts/.Aptfile +++ b/.github/scripts/.Aptfile @@ -2,8 +2,11 @@ package 'cmake' package 'ccache' package 'git' package 'jq' +package 'libcurl4-openssl-dev' +package 'libicu-dev' package 'libopenblas-dev' package 'libopenblas-openmp-dev' package 'libsimde-dev' +package 'libvulkan-dev' package 'ninja-build', bin: 'ninja' package 'pkg-config' diff --git a/CMakeLists.txt b/CMakeLists.txt index 70f7d23b..06ed0987 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -110,7 +110,7 @@ set(USE_SYSTEM_ICU if(USE_SYSTEM_ICU) find_package( - ICU 75.1 + ICU 70.1 COMPONENTS data uc i18n REQUIRED) target_link_libraries(${CMAKE_PROJECT_NAME} PRIVATE "${ICU_LIBRARIES}") From 6e97f54767c01252e2ea661d13756c349437dc82 Mon Sep 17 00:00:00 2001 From: Tabby Cromarty Date: Thu, 30 Oct 2025 15:03:51 +0000 Subject: [PATCH 3/3] Stick to using static ICU for CI builds for compatibility --- CMakePresets.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/CMakePresets.json b/CMakePresets.json index a172f0d0..2f9f0450 100644 --- a/CMakePresets.json +++ b/CMakePresets.json @@ -96,7 +96,8 @@ "description": "Build for Linux x86_64 on CI", "cacheVariables": { "CMAKE_BUILD_TYPE": "RelWithDebInfo", - "CMAKE_COMPILE_WARNING_AS_ERROR": true + "CMAKE_COMPILE_WARNING_AS_ERROR": true, + "USE_SYSTEM_ICU": false } }, {