diff options
| author | Brad King <brad.king@kitware.com> | 2016-03-18 13:43:20 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-03-18 13:43:20 (GMT) |
| commit | 1bcdc4db1bcfc75cf9813bc279840b975e74892d (patch) | |
| tree | 4eafa010c6684bb866adbf55978305aad9976f03 /Tests/Module/GenerateExportHeader/reference/Empty | |
| parent | b7eb7e0f78f37b6a7dfc6f9f300286472b7f3499 (diff) | |
| parent | 6a6e5d89b5665508276d65de4c82f0b4daa2dcfd (diff) | |
| download | CMake-1bcdc4db1bcfc75cf9813bc279840b975e74892d.zip CMake-1bcdc4db1bcfc75cf9813bc279840b975e74892d.tar.gz CMake-1bcdc4db1bcfc75cf9813bc279840b975e74892d.tar.bz2 | |
Merge topic 'GenerateExportHeader-fix-name-leak'
6a6e5d89 GenerateExportHeader: Allow common NO_DEPRECATED_MACRO_NAME for multiple libs
be5a8973 GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)
Diffstat (limited to 'Tests/Module/GenerateExportHeader/reference/Empty')
| -rw-r--r-- | Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h | 7 | ||||
| -rw-r--r-- | Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h b/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h index b6749b2..e8af0a5 100644 --- a/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h +++ b/Tests/Module/GenerateExportHeader/reference/Empty/libshared_export.h @@ -33,9 +33,10 @@ # define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED #endif -#define DEFINE_NO_DEPRECATED 0 -#if DEFINE_NO_DEPRECATED -# define LIBSHARED_NO_DEPRECATED +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef LIBSHARED_NO_DEPRECATED +# define LIBSHARED_NO_DEPRECATED +# endif #endif #endif diff --git a/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h b/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h index e8000e2..598bd71 100644 --- a/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h +++ b/Tests/Module/GenerateExportHeader/reference/Empty/libstatic_export.h @@ -33,9 +33,10 @@ # define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED #endif -#define DEFINE_NO_DEPRECATED 0 -#if DEFINE_NO_DEPRECATED -# define LIBSTATIC_NO_DEPRECATED +#if 0 /* DEFINE_NO_DEPRECATED */ +# ifndef LIBSTATIC_NO_DEPRECATED +# define LIBSTATIC_NO_DEPRECATED +# endif #endif #endif |