diff options
| author | Andreas Schuh <andreas.schuh.84@gmail.com> | 2016-03-17 11:02:26 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-03-17 14:40:24 (GMT) |
| commit | be5a8973c39e13d8978c242936dca63a9a746a57 (patch) | |
| tree | 6dbc135114c5df0e03df464d14f338b0d2b998ff /Modules/exportheader.cmake.in | |
| parent | bf0712866f3245034f5ee7d5835f5e4ed5f47626 (diff) | |
| download | CMake-be5a8973c39e13d8978c242936dca63a9a746a57.zip CMake-be5a8973c39e13d8978c242936dca63a9a746a57.tar.gz CMake-be5a8973c39e13d8978c242936dca63a9a746a57.tar.bz2 | |
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/exportheader.cmake.in')
| -rw-r--r-- | Modules/exportheader.cmake.in | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in index 118de16..7058f54 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 |