From c7b0de1bb4c528518c295026b8bd16006c637cb6 Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Thu, 18 Sep 2025 15:43:31 +0200 Subject: [PATCH 1/2] CI: set_matrix: add more android toolchain parameter Try to fix the Android toolchain for more projects by setting more variables. Fixes: https://github.com/cpp-pm/hunter/issues/825 --- .github/workflows/set_matrix.py | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/set_matrix.py b/.github/workflows/set_matrix.py index 19aa175504..1ff90ca3d9 100755 --- a/.github/workflows/set_matrix.py +++ b/.github/workflows/set_matrix.py @@ -75,7 +75,9 @@ def create_toolchain( out += f"""\ set(CMAKE_SYSTEM_NAME "Android") set(CMAKE_SYSTEM_VERSION "{android_api}") # API level +set(ANDROID_PLATFORM "android-{android_api}") # API level set(CMAKE_ANDROID_ARCH_ABI "{android_arch_abi}") +set(ANDROID_ABI "{android_arch_abi}") set(CMAKE_ANDROID_NDK "$ENV{{ANDROID_NDK}}") # provided by GitHub string(COMPARE EQUAL "${{CMAKE_ANDROID_NDK}}" "" _is_empty) @@ -95,6 +97,7 @@ def create_toolchain( # for android if we have libcxx in toolchain assume static runtime out += f"""\ set(CMAKE_ANDROID_STL_TYPE "c++_static") # LLVM libc++ static +set(ANDROID_STL "c++_static") """ m = re.match(r"^osx-(\d+)-(\d+)", parsed_toolchain) From 4fa26b6ba5edce118be0b5d191b4d0d49a14168e Mon Sep 17 00:00:00 2001 From: Reinhold Gschweicher Date: Thu, 18 Sep 2025 15:45:00 +0200 Subject: [PATCH 2/2] [WIP] DO NOT MERGE: trigger OpenSSL build to check android --- cmake/projects/OpenSSL/hunter.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/cmake/projects/OpenSSL/hunter.cmake b/cmake/projects/OpenSSL/hunter.cmake index f3bb1a1fb9..08dca4f1df 100755 --- a/cmake/projects/OpenSSL/hunter.cmake +++ b/cmake/projects/OpenSSL/hunter.cmake @@ -795,3 +795,4 @@ endif() hunter_cacheable(OpenSSL) hunter_download(PACKAGE_NAME OpenSSL PACKAGE_INTERNAL_DEPS_ID "29") +