mirror of
https://github.com/gentoo-mirror/gentoo.git
synced 2026-01-05 14:07:27 -08:00
media-video/haruna: Sync w/ latest rev of upstream pending CMake MR
See also: https://invent.kde.org/multimedia/haruna/-/merge_requests/98 Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
This commit is contained in:
parent
2562a8b31f
commit
8b16946ba0
@ -1,4 +1,4 @@
|
||||
From 98e3fdb0308b1cebf986136cc44f0e7c42bdd708 Mon Sep 17 00:00:00 2001
|
||||
From 1d9feb9125281209ccf42d58ed93cb23ffc1b316 Mon Sep 17 00:00:00 2001
|
||||
From: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
Date: Mon, 27 Oct 2025 17:24:34 +0100
|
||||
Subject: [PATCH] Raise CMake minimum to 3.16...3.31 range
|
||||
@ -11,14 +11,14 @@ time CMake version <=3.31 enacted. Tested with CMake 4.1.2.
|
||||
|
||||
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
|
||||
---
|
||||
CMakeLists.txt | 2 +-
|
||||
1 file changed, 1 insertion(+), 1 deletion(-)
|
||||
CMakeLists.txt | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
||||
index 1e533e1f..ad5dac88 100644
|
||||
index 1e533e1f..77a7071a 100644
|
||||
--- a/CMakeLists.txt
|
||||
+++ b/CMakeLists.txt
|
||||
@@ -4,7 +4,7 @@
|
||||
@@ -4,9 +4,16 @@
|
||||
# SPDX-License-Identifier: BSD-3-Clause
|
||||
#
|
||||
|
||||
@ -26,7 +26,16 @@ index 1e533e1f..ad5dac88 100644
|
||||
+cmake_minimum_required(VERSION 3.16...3.31)
|
||||
|
||||
cmake_policy(SET CMP0048 NEW)
|
||||
+
|
||||
+# TODO: Drop when KF6_MIN_VERSION is raised to >=6.9.0
|
||||
+# flatpak(?) ships ECM lower than that (missing commit 24fa7e53)
|
||||
+if(POLICY CMP0175)
|
||||
+ cmake_policy(SET CMP0175 OLD)
|
||||
+endif()
|
||||
+
|
||||
project(haruna VERSION 1.6.0 LANGUAGES CXX)
|
||||
|
||||
set(QT_QML_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/src)
|
||||
--
|
||||
2.51.1
|
||||
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user