diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-03-17 11:02:26 +0000 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-17 10:40:24 -0400 |
| commit | be5a8973c39e13d8978c242936dca63a9a746a57 (patch) | |
| tree | 6dbc135114c5df0e03df464d14f338b0d2b998ff /Modules | |
| parent | bf0712866f3245034f5ee7d5835f5e4ed5f47626 (diff) | |
| download | cmake-be5a8973c39e13d8978c242936dca63a9a746a57.tar.gz | |
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.
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/GenerateExportHeader.cmake | 4 | ||||
| -rw-r--r-- | Modules/exportheader.cmake.in | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/Modules/GenerateExportHeader.cmake b/Modules/GenerateExportHeader.cmake index 4f4efbcf37..6389d3072d 100644 --- a/Modules/GenerateExportHeader.cmake +++ b/Modules/GenerateExportHeader.cmake @@ -341,7 +341,9 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY) string(MAKE_C_IDENTIFIER ${STATIC_DEFINE} STATIC_DEFINE) if(_GEH_DEFINE_NO_DEPRECATED) - set(DEFINE_NO_DEPRECATED TRUE) + set(DEFINE_NO_DEPRECATED 1) + else() + set(DEFINE_NO_DEPRECATED 0) endif() if(_GEH_NO_DEPRECATED_MACRO_NAME) 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 |