summaryrefslogtreecommitdiff
path: root/Modules
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-10-27 11:17:09 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2016-10-27 11:17:09 -0400
commit8f6fd091b8b2faac52082a5dc854966e70ab3447 (patch)
treea877b7d0ecc1e87e4929acab87865274dd538e77 /Modules
parent6613434376740218fc74950ae5fc2e32baa5fa89 (diff)
parent05e05cd2aae9d00d2ed89a4f0cb9ef2f2976ae80 (diff)
downloadcmake-8f6fd091b8b2faac52082a5dc854966e70ab3447.tar.gz
Merge topic 'intel-compiler-windows-c++98'
05e05cd2 Intel: Fix compiler C++98 standard flag on Windows
Diffstat (limited to 'Modules')
-rw-r--r--Modules/Compiler/Intel-CXX.cmake6
1 files changed, 5 insertions, 1 deletions
diff --git a/Modules/Compiler/Intel-CXX.cmake b/Modules/Compiler/Intel-CXX.cmake
index 73dd7faef8..29e02d3f4a 100644
--- a/Modules/Compiler/Intel-CXX.cmake
+++ b/Modules/Compiler/Intel-CXX.cmake
@@ -34,7 +34,11 @@ elseif (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
endif()
if (NOT CMAKE_CXX_COMPILER_VERSION VERSION_LESS 12.1)
- set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
+ if("x${CMAKE_CXX_SIMULATE_ID}" STREQUAL "xMSVC")
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=gnu++98")
+ else()
+ set(CMAKE_CXX98_STANDARD_COMPILE_OPTION "${_std}=c++98")
+ endif()
set(CMAKE_CXX98_EXTENSION_COMPILE_OPTION "${_std}=${_ext}98")
endif()