diff options
| author | Brad King <brad.king@kitware.com> | 2016-10-27 13:11:10 -0400 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-10-27 13:28:34 -0400 |
| commit | 967dcf36d07ba9b7e40383834906fe1d657456b3 (patch) | |
| tree | 75739e43f2d4607cada9cb167603dfe5ba25ac46 | |
| parent | c6c8c24908e108b7b3c5c76e29197323ac3a4287 (diff) | |
| download | cmake-967dcf36d07ba9b7e40383834906fe1d657456b3.tar.gz | |
Intel: Remove incorrect C++98 standard compiler flag on Windows
The change in commit 05e05cd2 (Intel: Fix compiler C++98 standard flag
on Windows, 2016-10-26) was wrong. The Intel C++ Compiler for Windows
does not support either `-Qstd=c++98` or `-Qstd=gnu++98`. Simply remove
both flags for this compiler and use no options at all to achieve this
mode.
Issue: #16384
| -rw-r--r-- | Modules/Compiler/Intel-CXX.cmake | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake index 29e02d3f4a..63081cce45 100644 --- a/Modules/Compiler/Intel-CXX.cmake +++ b/Modules/Compiler/Intel-CXX.cmake @@ -35,11 +35,12 @@ endif() if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC") - set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=gnu++98") + set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "") + set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "") else() set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98") + set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=gnu++98") endif() - set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=${_ext}98") endif() if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) @@ -67,13 +68,13 @@ macro(cmake_record_cxx_compile_features) if(NOT "x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC" AND NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1) if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 15.0) - _get_intel_features(${CMAKE_CXX14_STANDARD_COMPILE_OPTION} CMAKE_CXX14_COMPILE_FEATURES) + _get_intel_features("${CMAKE_CXX14_STANDARD_COMPILE_OPTION}" CMAKE_CXX14_COMPILE_FEATURES) endif() if (_result EQUAL 0) - _get_intel_features(${CMAKE_CXX11_STANDARD_COMPILE_OPTION} CMAKE_CXX11_COMPILE_FEATURES) + _get_intel_features("${CMAKE_CXX11_STANDARD_COMPILE_OPTION}" CMAKE_CXX11_COMPILE_FEATURES) endif() if (_result EQUAL 0) - _get_intel_features(${CMAKE_CXX98_STANDARD_COMPILE_OPTION} CMAKE_CXX98_COMPILE_FEATURES) + _get_intel_features("${CMAKE_CXX98_STANDARD_COMPILE_OPTION}" CMAKE_CXX98_COMPILE_FEATURES) endif() endif() endmacro() |