diff options
| author | Joshua Vandaële <joshua@vandaele.software> | 2026-01-20 01:38:18 +0100 |
|---|---|---|
| committer | Joshua Vandaële <joshua@vandaele.software> | 2026-07-24 03:45:13 +0200 |
| commit | 808a82d5dd7addfef9728a2ccc2f7ea713dfa748 (patch) | |
| tree | e747cdc8d82761847613570a7998451ec17b5deb | |
| parent | 6da4bc38e1424e743df01face292a5730aadd571 (diff) | |
CMake: Bump minimum requirement to 3.25
| -rw-r--r-- | CMakeLists.txt | 10 | ||||
| -rw-r--r-- | Source/Android/app/build.gradle.kts | 2 |
2 files changed, 2 insertions, 10 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 8a01fad918..d4f0720ffe 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,14 +1,10 @@ ######################################## # General setup # -cmake_minimum_required(VERSION 3.20...4.2.1) +cmake_minimum_required(VERSION 3.25...4.2.1) cmake_policy(SET CMP0080 OLD) # allow using BundleUtilities at configure time -if (POLICY CMP0141) - cmake_policy(SET CMP0141 NEW) # MSVC debug information format flags are selected by an abstraction. -endif() - # Minimum OS X version. # This is inserted into the Info.plist as well. set(CMAKE_OSX_DEPLOYMENT_TARGET "11.0.0" CACHE STRING "") @@ -23,10 +19,6 @@ set(CMAKE_CXX_SCAN_FOR_MODULES OFF) project(dolphin-emu) -if (CMAKE_VERSION VERSION_LESS "3.25" AND CMAKE_SYSTEM_NAME MATCHES "Linux") - set(LINUX TRUE) -endif() - if (MSVC) set(CMAKE_C_STANDARD 99) set(CMAKE_CXX_STANDARD 23) diff --git a/Source/Android/app/build.gradle.kts b/Source/Android/app/build.gradle.kts index 64abfd0037..2fc4cb7a94 100644 --- a/Source/Android/app/build.gradle.kts +++ b/Source/Android/app/build.gradle.kts @@ -91,7 +91,7 @@ android { externalNativeBuild { cmake { path = file("../../../CMakeLists.txt") - version = "3.22.1+" + version = "3.25.0+" } } namespace = "org.dolphinemu.dolphinemu" |