diff options
| author | Brad King <brad.king@kitware.com> | 2019-10-11 12:34:08 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-10-11 12:34:16 (GMT) |
| commit | ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336 (patch) | |
| tree | 8cf1e6320bc75f1715f69bc62290dd5bf519490d /Modules | |
| parent | 696b2d40d4bdf5a8094f7d7c3e9ac66b039f34bf (diff) | |
| parent | 3fb146cb1149ecb90404a5276c8db3cb46e00889 (diff) | |
| download | CMake-ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336.zip CMake-ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336.tar.gz CMake-ae24597202bbcc51ebcc9e32ae1b3ee8a8a99336.tar.bz2 | |
Merge topic 'intel-19-compile-features'
3fb146cb11 Tests: Update CompileFeatures test for Intel 19 with VS 2015
847e8bc98c Intel: Fix default C++ dialect detection on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3900
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 34639b4..a743ce7 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -27,10 +27,20 @@ char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; @CMAKE_CXX_COMPILER_ID_PLATFORM_CONTENT@ @CMAKE_CXX_COMPILER_ID_ERROR_FOR_TEST@ -#if defined(_MSC_VER) && defined(_MSVC_LANG) -#define CXX_STD _MSVC_LANG +#if defined(__INTEL_COMPILER) && defined(_MSVC_LANG) && _MSVC_LANG < 201403L +# if defined(__INTEL_CXX11_MODE__) +# if defined(__cpp_aggregate_nsdmi) +# define CXX_STD 201402L +# else +# define CXX_STD 201103L +# endif +# else +# define CXX_STD 199711L +# endif +#elif defined(_MSC_VER) && defined(_MSVC_LANG) +# define CXX_STD _MSVC_LANG #else -#define CXX_STD __cplusplus +# define CXX_STD __cplusplus #endif const char* info_language_dialect_default = "INFO" ":" "dialect_default[" |