diff options
| author | Brad King <brad.king@kitware.com> | 2013-10-07 19:44:39 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2013-10-07 19:44:39 (GMT) |
| commit | c76b380181f917bef98b10efa85191d4d201e57f (patch) | |
| tree | e0434041fc1f1301897c02a4371205aa7d90bc78 | |
| parent | 3e2e0609997f0be87f161527d4270fbbe88b04c0 (diff) | |
| parent | cdf55d5cb4c03a29c21b5eae8ac5c59d244b9b45 (diff) | |
| download | CMake-c76b380181f917bef98b10efa85191d4d201e57f.zip CMake-c76b380181f917bef98b10efa85191d4d201e57f.tar.gz CMake-c76b380181f917bef98b10efa85191d4d201e57f.tar.bz2 | |
Merge topic 'deprecation-macro-refactor'
cdf55d5 GEH: Make each element of the deprecation macros overridable.
80d5090 GEH: Use the macro for the deprecation attribute after definiting it.
| -rw-r--r-- | Modules/exportheader.cmake.in | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/exportheader.cmake.in b/Modules/exportheader.cmake.in index 80a879d..118de16 100644 --- a/Modules/exportheader.cmake.in +++ b/Modules/exportheader.cmake.in @@ -23,8 +23,14 @@ #ifndef @DEPRECATED_MACRO_NAME@ # define @DEPRECATED_MACRO_NAME@ @DEFINE_DEPRECATED@ -# define @DEPRECATED_MACRO_NAME@_EXPORT @EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@ -# define @DEPRECATED_MACRO_NAME@_NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEFINE_DEPRECATED@ +#endif + +#ifndef @DEPRECATED_MACRO_NAME@_EXPORT +# define @DEPRECATED_MACRO_NAME@_EXPORT @EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@ +#endif + +#ifndef @DEPRECATED_MACRO_NAME@_NO_EXPORT +# define @DEPRECATED_MACRO_NAME@_NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@ #endif #cmakedefine01 DEFINE_NO_DEPRECATED |