diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-30 13:31:35 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2019-05-30 13:31:35 (GMT) |
| commit | 3a7f493b7b92eeead6841c393d7bbed62b52cbc9 (patch) | |
| tree | 2933710b08894d7edbca39cf7d66c72689fe4af5 /Source/kwsys/SystemTools.cxx | |
| parent | c68efd196eace176bed5216573d99fabba66df84 (diff) | |
| parent | 9ef1e13bcccd46c822ee813017601781bbe9a43d (diff) | |
| download | CMake-3a7f493b7b92eeead6841c393d7bbed62b52cbc9.zip CMake-3a7f493b7b92eeead6841c393d7bbed62b52cbc9.tar.gz CMake-3a7f493b7b92eeead6841c393d7bbed62b52cbc9.tar.bz2 | |
Merge branch 'upstream-KWSys' into update-kwsys
* upstream-KWSys:
KWSys 2019-05-30 (f892bacf)
Diffstat (limited to 'Source/kwsys/SystemTools.cxx')
| -rw-r--r-- | Source/kwsys/SystemTools.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/kwsys/SystemTools.cxx b/Source/kwsys/SystemTools.cxx index e756cdc..2135913 100644 --- a/Source/kwsys/SystemTools.cxx +++ b/Source/kwsys/SystemTools.cxx @@ -4366,6 +4366,9 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() # pragma warning(push) # ifdef __INTEL_COMPILER # pragma warning(disable : 1478) +# elif defined __clang__ +# pragma clang diagnostic push +# pragma clang diagnostic ignored "-Wdeprecated-declarations" # else # pragma warning(disable : 4996) # endif @@ -4375,7 +4378,11 @@ std::string SystemTools::GetOperatingSystemNameAndVersion() return 0; } # ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx -# pragma warning(pop) +# ifdef __clang__ +# pragma clang diagnostic pop +# else +# pragma warning(pop) +# endif # endif switch (osvi.dwPlatformId) { |