Merge topic 'GenerateExportHeader-fix-name-leak'
6a6e5d89
GenerateExportHeader: Allow common NO_DEPRECATED_MACRO_NAME for multiple libsbe5a8973
GenerateExportHeader: Do not define DEFINE_NO_DEPRECATED (#16022)
This commit is contained in:
commit
1bcdc4db1b
|
@ -341,7 +341,9 @@ macro(_DO_GENERATE_EXPORT_HEADER TARGET_LIBRARY)
|
||||||
string(MAKE_C_IDENTIFIER ${STATIC_DEFINE} STATIC_DEFINE)
|
string(MAKE_C_IDENTIFIER ${STATIC_DEFINE} STATIC_DEFINE)
|
||||||
|
|
||||||
if(_GEH_DEFINE_NO_DEPRECATED)
|
if(_GEH_DEFINE_NO_DEPRECATED)
|
||||||
set(DEFINE_NO_DEPRECATED TRUE)
|
set(DEFINE_NO_DEPRECATED 1)
|
||||||
|
else()
|
||||||
|
set(DEFINE_NO_DEPRECATED 0)
|
||||||
endif()
|
endif()
|
||||||
|
|
||||||
if(_GEH_NO_DEPRECATED_MACRO_NAME)
|
if(_GEH_NO_DEPRECATED_MACRO_NAME)
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define @DEPRECATED_MACRO_NAME@_NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
|
# define @DEPRECATED_MACRO_NAME@_NO_EXPORT @NO_EXPORT_MACRO_NAME@ @DEPRECATED_MACRO_NAME@
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#cmakedefine01 DEFINE_NO_DEPRECATED
|
#if @DEFINE_NO_DEPRECATED@ /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef @NO_DEPRECATED_MACRO_NAME@
|
||||||
# define @NO_DEPRECATED_MACRO_NAME@
|
# define @NO_DEPRECATED_MACRO_NAME@
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
# define LIBSHARED_DEPRECATED_NO_EXPORT LIBSHARED_NO_EXPORT LIBSHARED_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSHARED_NO_DEPRECATED
|
||||||
# define LIBSHARED_NO_DEPRECATED
|
# define LIBSHARED_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -33,9 +33,10 @@
|
||||||
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
# define LIBSTATIC_DEPRECATED_NO_EXPORT LIBSTATIC_NO_EXPORT LIBSTATIC_DEPRECATED
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define DEFINE_NO_DEPRECATED 0
|
#if 0 /* DEFINE_NO_DEPRECATED */
|
||||||
#if DEFINE_NO_DEPRECATED
|
# ifndef LIBSTATIC_NO_DEPRECATED
|
||||||
# define LIBSTATIC_NO_DEPRECATED
|
# define LIBSTATIC_NO_DEPRECATED
|
||||||
# endif
|
# endif
|
||||||
|
#endif
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in New Issue