From be5a8973c39e13d8978c242936dca63a9a746a57 Mon Sep 17 00:00:00 2001 From: Andreas Schuh Date: Thu, 17 Mar 2016 11:02:26 +0000 Subject: GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022) Previously we allowed this definition to persist outside our header. This would cause conflicts across multiple such headers because the name was always the same. Fix this by avoiding the definition altogether. --- Modules/exportheader.cmake.in | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Modules/exportheader.cmake.in') diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in index 118de16d69..7058f545a7 100644 --- a/Modules/exportheader.cmake.in +++ b/Modules/exportheader.cmake.in @@ -33,8 +33,7 @@ # define @DEPRECATED_MACRO_NAME@_NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@ #endif -#cmakedefine01 DEFINE_NO_DEPRECATED -#if DEFINE_NO_DEPRECATED +#if @DEFINE_NO_DEPRECATED@ /* DEFINE_NO_DEPRECATED */ # define @NO_DEPRECATED_MACRO_NAME@ #endif -- cgit v1.2.1