diff options
author | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2018-06-01 16:54:13 (GMT) |
commit | 81870f1159a7b2649b027a6c3f75eba555831488 (patch) | |
tree | 05eb767f2f2becb6480cfe348d08ebca4e1fc1cf /Source/kwsys/Configure.hxx.in | |
parent | eed0df951d95d48e7856107175a2baba212c3206 (diff) | |
parent | 3af8c7715b359affce99c575bdcb84ca87585bb2 (diff) | |
download | CMake-81870f1159a7b2649b027a6c3f75eba555831488.zip CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.gz CMake-81870f1159a7b2649b027a6c3f75eba555831488.tar.bz2 |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2018-06-01 (8ef62b28)
Diffstat (limited to 'Source/kwsys/Configure.hxx.in')
-rw-r--r-- | Source/kwsys/Configure.hxx.in | 49 |
1 files changed, 25 insertions, 24 deletions
diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in index 05afc7d..d1e7464 100644 --- a/Source/kwsys/Configure.hxx.in +++ b/Source/kwsys/Configure.hxx.in @@ -13,32 +13,33 @@ @KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H@ #if defined(__SUNPRO_CC) && __SUNPRO_CC > 0x5130 && defined(__has_attribute) -#define @KWSYS_NAMESPACE@__has_cpp_attribute(x) __has_attribute(x) +# define @KWSYS_NAMESPACE@__has_cpp_attribute(x) __has_attribute(x) #elif defined(__has_cpp_attribute) -#define @KWSYS_NAMESPACE@__has_cpp_attribute(x) __has_cpp_attribute(x) +# define @KWSYS_NAMESPACE@__has_cpp_attribute(x) __has_cpp_attribute(x) #else -#define @KWSYS_NAMESPACE@__has_cpp_attribute(x) 0 +# define @KWSYS_NAMESPACE@__has_cpp_attribute(x) 0 #endif #if __cplusplus >= 201103L -#define @KWSYS_NAMESPACE@_NULLPTR nullptr +# define @KWSYS_NAMESPACE@_NULLPTR nullptr #else -#define @KWSYS_NAMESPACE@_NULLPTR 0 +# define @KWSYS_NAMESPACE@_NULLPTR 0 #endif #ifndef @KWSYS_NAMESPACE@_FALLTHROUGH -#if __cplusplus >= 201703L && @KWSYS_NAMESPACE@__has_cpp_attribute(fallthrough) -#define @KWSYS_NAMESPACE@_FALLTHROUGH [[fallthrough]] -#elif __cplusplus >= 201103L && \ - @KWSYS_NAMESPACE@__has_cpp_attribute(gnu::fallthrough) -#define @KWSYS_NAMESPACE@_FALLTHROUGH [[gnu::fallthrough]] -#elif __cplusplus >= 201103L && \ - @KWSYS_NAMESPACE@__has_cpp_attribute(clang::fallthrough) -#define @KWSYS_NAMESPACE@_FALLTHROUGH [[clang::fallthrough]] -#endif +# if __cplusplus >= 201703L && \ + @KWSYS_NAMESPACE@__has_cpp_attribute(fallthrough) +# define @KWSYS_NAMESPACE@_FALLTHROUGH [[fallthrough]] +# elif __cplusplus >= 201103L && \ + @KWSYS_NAMESPACE@__has_cpp_attribute(gnu::fallthrough) +# define @KWSYS_NAMESPACE@_FALLTHROUGH [[gnu::fallthrough]] +# elif __cplusplus >= 201103L && \ + @KWSYS_NAMESPACE@__has_cpp_attribute(clang::fallthrough) +# define @KWSYS_NAMESPACE@_FALLTHROUGH [[clang::fallthrough]] +# endif #endif #ifndef @KWSYS_NAMESPACE@_FALLTHROUGH -#define @KWSYS_NAMESPACE@_FALLTHROUGH static_cast<void>(0) +# define @KWSYS_NAMESPACE@_FALLTHROUGH static_cast<void>(0) #endif #undef @KWSYS_NAMESPACE@__has_cpp_attribute @@ -46,15 +47,15 @@ /* If building a C++ file in kwsys itself, give the source file access to the macros without a configured namespace. */ #if defined(KWSYS_NAMESPACE) -#if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS -#define kwsys @KWSYS_NAMESPACE@ -#endif -#define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS -#define KWSYS_STL_HAS_WSTRING @KWSYS_NAMESPACE@_STL_HAS_WSTRING -#define KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H \ - @KWSYS_NAMESPACE@_CXX_HAS_EXT_STDIO_FILEBUF_H -#define KWSYS_FALLTHROUGH @KWSYS_NAMESPACE@_FALLTHROUGH -#define KWSYS_NULLPTR @KWSYS_NAMESPACE@_NULLPTR +# if !@KWSYS_NAMESPACE@_NAME_IS_KWSYS +# define kwsys @KWSYS_NAMESPACE@ +# endif +# define KWSYS_NAME_IS_KWSYS @KWSYS_NAMESPACE@_NAME_IS_KWSYS +# define KWSYS_STL_HAS_WSTRING @KWSYS_NAMESPACE@_STL_HAS_WSTRING +# define KWSYS_CXX_HAS_EXT_STDIO_FILEBUF_H \ + @KWSYS_NAMESPACE@_CXX_HAS_EXT_STDIO_FILEBUF_H +# define KWSYS_FALLTHROUGH @KWSYS_NAMESPACE@_FALLTHROUGH +# define KWSYS_NULLPTR @KWSYS_NAMESPACE@_NULLPTR #endif #endif |