diff options
| author | Brad King <brad.king@kitware.com> | 2003-06-19 22:57:11 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2003-06-19 22:57:11 (GMT) |
| commit | c21ad6298731ae7d1d7534ad9dc078fee5884dab (patch) | |
| tree | 4a7773aa3569eaae11bae0bf4f97ee051ec2c1b7 /Source/kwsys/Configure.hxx.in | |
| parent | caeada7f274368c175f8b3e9c2c6b20017a41918 (diff) | |
| download | CMake-c21ad6298731ae7d1d7534ad9dc078fee5884dab.zip CMake-c21ad6298731ae7d1d7534ad9dc078fee5884dab.tar.gz CMake-c21ad6298731ae7d1d7534ad9dc078fee5884dab.tar.bz2 | |
ENH: Added full configuration of namespace even for Configure.hxx macro definitions.
Diffstat (limited to 'Source/kwsys/Configure.hxx.in')
| -rw-r--r-- | Source/kwsys/Configure.hxx.in | 51 |
1 files changed, 42 insertions, 9 deletions
diff --git a/Source/kwsys/Configure.hxx.in b/Source/kwsys/Configure.hxx.in index 367f887..ed4f8ec 100644 --- a/Source/kwsys/Configure.hxx.in +++ b/Source/kwsys/Configure.hxx.in @@ -17,20 +17,53 @@ #ifndef @KWSYS_NAMESPACE@_Configure_hxx #define @KWSYS_NAMESPACE@_Configure_hxx -/* This configuration should match for all instances of kwsys. */ -#cmakedefine KWSYS_NO_STD_NAMESPACE -#cmakedefine KWSYS_NO_ANSI_STREAM_HEADERS -#cmakedefine KWSYS_NO_ANSI_STRING_STREAM -#cmakedefine KWSYS_NO_ANSI_FOR_SCOPE +/* Defined if kwsys namespace is "kwsys". */ +#if @KWSYS_NAME_IS_KWSYS@ +# define @KWSYS_NAMESPACE@_NAME_IS_KWSYS +#endif + +/* Defined if no ANSI C++ stream headers are present. */ +#if @KWSYS_NO_ANSI_STREAM_HEADERS@ +# define @KWSYS_NAMESPACE@_NO_ANSI_STREAM_HEADERS +#endif + +/* Defined if no ANSI C++ <sstream> header is present. */ +#if @KWSYS_NO_ANSI_STRING_STREAM@ +# define @KWSYS_NAMESPACE@_NO_ANSI_STRING_STREAM +#endif +/* Defined if no std namespace is present. */ +#if @KWSYS_NO_STD_NAMESPACE@ +# define @KWSYS_NAMESPACE@_NO_STD_NAMESPACE +#endif + +/* Defined if std namespace is the GCC hack. */ #if defined(__GNUC__) && (__GNUC__ < 3) -# define KWSYS_FAKE_STD_NAMESPACE +# define @KWSYS_NAMESPACE@_FAKE_STD_NAMESPACE #endif -#if defined(KWSYS_NO_STD_NAMESPACE) -# define kwsys_std +/* Define the std namespace macro. */ +#if defined(@KWSYS_NAMESPACE@_NO_STD_NAMESPACE) +# define @KWSYS_NAMESPACE@_std #else -# define kwsys_std std +# define @KWSYS_NAMESPACE@_std std +#endif + +/* 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 !defined(@KWSYS_NAMESPACE@_NAME_IS_KWSYS) +# define kwsys_std @KWSYS_NAMESPACE@_std +# endif +# if defined(@KWSYS_NAMESPACE@_NO_STD_NAMESPACE) +# define KWSYS_NO_STD_NAMESPACE +# endif +# if defined(@KWSYS_NAMESPACE@_NO_ANSI_STREAM_HEADERS) +# define KWSYS_NO_ANSI_STREAM_HEADERS +# endif +# if defined(@KWSYS_NAMESPACE@_NO_ANSI_STRING_STREAM) +# define KWSYS_NO_ANSI_STRING_STREAM +# endif #endif #endif |