|
|
@@ -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()
|