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.
This commit is contained in:
Andreas Schuh
Brad King
parent
bf0712866f
commit
be5a8973c3
|
|
@ -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)
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Loading…
Reference in New Issue