From f26b9b174a47066f88c2b3ab2a01218248f94cbd Mon Sep 17 00:00:00 2001 From: PabloMK7 Date: Wed, 18 Jun 2025 21:44:42 +0200 Subject: [PATCH] cmake: Bump min version to 3.25 globally and to 3.30.3 for android (#1151) * cmake: Bump min version to 3.25 and update android to 3.30.3 * app/build.gradle.kts: Set minimum CMake version rather than exact version --------- Co-authored-by: OpenSauce --- .github/workflows/build.yml | 3 +++ CMakeLists.txt | 5 +++-- src/android/app/build.gradle.kts | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 77940871e..bf4a49f31 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -232,6 +232,9 @@ jobs: run: | sudo apt-get update -y sudo apt-get install ccache apksigner -y + - name: Update Android SDK CMake version + run: | + echo "y" | ${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager "cmake;3.30.3" - name: Build run: JAVA_HOME=$JAVA_HOME_17_X64 ./.ci/android.sh env: diff --git a/CMakeLists.txt b/CMakeLists.txt index 54051a4ef..c23b03ea9 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,6 @@ -# CMake 3.12 required for 20 to be a valid value for CXX_STANDARD -cmake_minimum_required(VERSION 3.15) +# CMake >=3.12 required for 20 to be a valid value for CXX_STANDARD, +# and >=3.25 required to make LTO work on Android. +cmake_minimum_required(VERSION 3.25) # Don't override the warning flags in MSVC: cmake_policy(SET CMP0092 NEW) diff --git a/src/android/app/build.gradle.kts b/src/android/app/build.gradle.kts index c2f896664..84006116f 100644 --- a/src/android/app/build.gradle.kts +++ b/src/android/app/build.gradle.kts @@ -150,7 +150,7 @@ android { externalNativeBuild { cmake { - version = "3.22.1" + version = "3.25.0+" path = file("../../../CMakeLists.txt") } }