forked from gentoo/gentoo
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
media-sound/tomahawk: Try to fix build with <cmake-3.10
Bug: https://bugs.gentoo.org/674826 Package-Manager: Portage-2.3.58, Repoman-2.3.12 Signed-off-by: Andreas Sturmlechner <[email protected]>
- Loading branch information
Showing
2 changed files
with
42 additions
and
2 deletions.
There are no files selected for viewing
37 changes: 37 additions & 0 deletions
37
media-sound/tomahawk/files/tomahawk-0.9.0_pre20181030-cmakepolicy.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,37 @@ | ||
From 663981b4dd28fca6cac0b079bed26c411e7d1722 Mon Sep 17 00:00:00 2001 | ||
From: Andreas Sturmlechner <[email protected]> | ||
Date: Fri, 25 Jan 2019 21:13:05 +0100 | ||
Subject: [PATCH] Fix build with <cmake-3.10 | ||
|
||
--- | ||
CMakeLists.txt | 8 ++++++-- | ||
1 file changed, 6 insertions(+), 2 deletions(-) | ||
|
||
diff --git a/CMakeLists.txt b/CMakeLists.txt | ||
index b44d2ee43..9422a808e 100644 | ||
--- a/CMakeLists.txt | ||
+++ b/CMakeLists.txt | ||
@@ -2,14 +2,18 @@ PROJECT( tomahawk ) | ||
CMAKE_MINIMUM_REQUIRED( VERSION 2.8.12 ) | ||
CMAKE_POLICY(SET CMP0017 NEW) | ||
CMAKE_POLICY(SET CMP0022 NEW) | ||
-CMAKE_POLICY(SET CMP0075 NEW) | ||
+IF(POLICY CMP0075) | ||
+ CMAKE_POLICY(SET CMP0075 NEW) | ||
+ENDIF() | ||
|
||
# TODO: | ||
# Update to NEW and fix things up | ||
CMAKE_POLICY(SET CMP0023 NEW) | ||
|
||
# Let AUTOMOC and AUTOUIC process generated files | ||
-CMAKE_POLICY(SET CMP0071 NEW) | ||
+IF(POLICY CMP0071) | ||
+ CMAKE_POLICY(SET CMP0071 NEW) | ||
+ENDIF() | ||
|
||
# TODO: | ||
# Disable automatic qtmain linking | ||
-- | ||
2.20.1 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters