diff options
| author | Brad King <brad.king@kitware.com> | 2015-01-21 14:15:44 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2015-01-21 14:15:44 (GMT) |
| commit | 7e468cd8f99daecfc1197883a0fd87bde771309b (patch) | |
| tree | cbda8c8301f4dd5531ee49a59d5cffb5f9159f0f /Source/kwsys/SystemInformation.cxx | |
| parent | f709776864bbd94c7aa839248adfbfe7d4f5cae6 (diff) | |
| parent | 77444a7d486c415508a9c754fd4cc29cbb33f12f (diff) | |
| download | CMake-7e468cd8f99daecfc1197883a0fd87bde771309b.zip CMake-7e468cd8f99daecfc1197883a0fd87bde771309b.tar.gz CMake-7e468cd8f99daecfc1197883a0fd87bde771309b.tar.bz2 | |
Merge branch 'upstream-kwsys' into update-kwsys
Diffstat (limited to 'Source/kwsys/SystemInformation.cxx')
| -rw-r--r-- | Source/kwsys/SystemInformation.cxx | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/Source/kwsys/SystemInformation.cxx b/Source/kwsys/SystemInformation.cxx index 3d5e728..9c7ceee 100644 --- a/Source/kwsys/SystemInformation.cxx +++ b/Source/kwsys/SystemInformation.cxx @@ -5069,7 +5069,11 @@ bool SystemInformationImplementation::QueryOSInformation() osvi.dwOSVersionInfoSize = sizeof (OSVERSIONINFOEXW); #ifdef KWSYS_WINDOWS_DEPRECATED_GetVersionEx # pragma warning (push) -# pragma warning (disable:4996) +# ifdef __INTEL_COMPILER +# pragma warning (disable:1478) +# else +# pragma warning (disable:4996) +# endif #endif bOsVersionInfoEx = GetVersionExW ((OSVERSIONINFOW*)&osvi); if (!bOsVersionInfoEx) |