mirror of
https://github.com/azahar-emu/azahar
synced 2025-11-06 15:09:58 +01:00
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 <opensauce04@gmail.com>
This commit is contained in:
parent
ce8798fffe
commit
f26b9b174a
3
.github/workflows/build.yml
vendored
3
.github/workflows/build.yml
vendored
@ -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:
|
||||
|
||||
@ -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)
|
||||
|
||||
@ -150,7 +150,7 @@ android {
|
||||
|
||||
externalNativeBuild {
|
||||
cmake {
|
||||
version = "3.22.1"
|
||||
version = "3.25.0+"
|
||||
path = file("../../../CMakeLists.txt")
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user