diff options
| author | Brad King <brad.king@kitware.com> | 2023-01-13 13:43:14 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2023-01-13 08:43:29 -0500 |
| commit | 45da44cc23e3cc3a0fc9309cd9fb0ce53b40b256 (patch) | |
| tree | 845794048077417e1404c2ac9f5b096544908060 | |
| parent | 97b4a0f5e3e54ec9bbd12bf516eac061f3be505e (diff) | |
| parent | 88f9fdcb037a67ea32007dfb4dc142d348115c78 (diff) | |
| download | cmake-45da44cc23e3cc3a0fc9309cd9fb0ce53b40b256.tar.gz | |
Merge topic 'IntelLLVM-msvc-no-cxx11' into release-3.25
88f9fdcb03 IntelLLVM: Avoid unnecessary -Qstd=c++11 flag on Windows
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !8069
| -rw-r--r-- | Modules/Compiler/IntelLLVM-CXX.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/Compiler/IntelLLVM-CXX.cmake b/Modules/Compiler/IntelLLVM-CXX.cmake index cae1f11993..4d3f5a1fe4 100644 --- a/Modules/Compiler/IntelLLVM-CXX.cmake +++ b/Modules/Compiler/IntelLLVM-CXX.cmake @@ -50,8 +50,8 @@ else() set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "") set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "") - set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "-Qstd=c++11") - set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "-Qstd=c++11") + set(CMAKE_CXX11_STANDARD_COMPILE_OPTION "") + set(CMAKE_CXX11_EXTENSION_COMPILE_OPTION "") set(CMAKE_CXX14_STANDARD_COMPILE_OPTION "-Qstd=c++14") set(CMAKE_CXX14_EXTENSION_COMPILE_OPTION "-Qstd=c++14") |