From d46f7bac0dc3cb8ac38cd6a655f9d75cb89aef22 Mon Sep 17 00:00:00 2001 From: Ralf Habacker Date: Thu, 5 Mar 2015 23:57:50 +0100 Subject: [PATCH] cmake: @VAR@ substitutions in set() are deprecated, use string(CONFIGURE) instead (policy CMP0053) Bug: https://bugs.freedesktop.org/show_bug.cgi?id=89450 Reviewed-by: Simon McVittie --- 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) # -- 2.7.4