Attachment 114055 Details for Bug 89450 – Fix cmake 3.1.3 policy CMP0053 warning

[patch] Fix cmake 3.1.3 policy CMP0053 warning

0003-Fix-cmake-3.1.3-policy-CMP0053-warning.patch (text/plain), 1.72 KB, created by Ralf Habacker on 2015-03-05 23:13:16 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2015-03-05 23:13:16 UTC

Size: 1.72 KB

patch

obsolete

>From 719517cee34eefd0326ad40cde1727a2e8921bc2 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 5 Mar 2015 23:57:50 +0100
>Subject: [PATCH 3/4] Fix cmake 3.1.3 policy CMP0053 warning.
>
>We can set this policy to NEW, because affected contexts has been refactored.
>
>See http://www.cmake.org/cmake/help/v3.1/policy/CMP0053.html for more details.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89450
>---
> cmake/CMakeLists.txt                | 1 +
> cmake/modules/MacrosAutotools.cmake | 4 ++--
> 2 files changed, 3 insertions(+), 2 deletions(-)
>
>diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
>index 582d05b..6fbfb40 100644
>--- a/cmake/CMakeLists.txt
>+++ b/cmake/CMakeLists.txt
>@@ -14,6 +14,7 @@ endif(COMMAND cmake_policy)
> 
> if(CMAKE_MAJOR_VERSION GREATER 2)
>     cmake_policy(SET CMP0026 NEW)
>+    cmake_policy(SET CMP0053 NEW)
> endif()
> 
> # detect version
>diff --git a/cmake/modules/MacrosAutotools.cmake b/cmake/modules/MacrosAutotools.cmake
>index 89828e0..8bb83cd 100644
>--- a/cmake/modules/MacrosAutotools.cmake
>+++ b/cmake/modules/MacrosAutotools.cmake
>@@ -76,7 +76,7 @@ macro(autopackage name version url support_url)
>     set(PACKAGE ${name})
>     set(VERSION ${DBUS_VERSION_STRING})
> 
>-    set(AUTOPACKAGE_CONFIG_H_TEMPLATE "/* generated by cmake macro autopackage */\n
>+    string(CONFIGURE "/* generated by cmake macro autopackage */\n
> /* Define to the address where bug reports for this package should be sent. */
> #define PACKAGE_BUGREPORT \"@PACKAGE_BUGREPORT@\"
> 
>@@ -98,7 +98,7 @@ macro(autopackage name version url support_url)
> /* defined by autotools package */
> #define PACKAGE \"@PACKAGE@\"
> #define VERSION \"@VERSION@\"
>-")
>+" AUTOPACKAGE_CONFIG_H_TEMPLATE)
> endmacro(autopackage)
> 
> #
>-- 
>1.8.4.5
>

Actions: View | Splinter Review

Attachments on bug 89450: 114053 | 114054 | 114055 | 114056

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.