From 07a955a1373c55ce5fb621d885936d07a8fa238d Mon Sep 17 00:00:00 2001 From: Timo Heister Date: Wed, 16 Aug 2017 15:58:51 -0400 Subject: [PATCH] cmake: fix intel compiler detection --- cmake/checks/check_01_cxx_features.cmake | 2 +- cmake/setup_compiler_flags_intel.cmake | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/cmake/checks/check_01_cxx_features.cmake b/cmake/checks/check_01_cxx_features.cmake index 8338513fac..50bfa71aa5 100644 --- a/cmake/checks/check_01_cxx_features.cmake +++ b/cmake/checks/check_01_cxx_features.cmake @@ -264,7 +264,7 @@ CHECK_CXX_SOURCE_COMPILES( // Check the version language macro, but skip MSVC because // MSVC reports 199711 even in MSVC 2017. - #if __cplusplus < 201103L && !defined(_MSC_VER) + #if __cplusplus < 201103L && !defined(_MSC_VER) && !defined(__INTEL_COMPILER) # error \"insufficient support for C++11\" #endif diff --git a/cmake/setup_compiler_flags_intel.cmake b/cmake/setup_compiler_flags_intel.cmake index 435a6d7120..b22cc9de59 100644 --- a/cmake/setup_compiler_flags_intel.cmake +++ b/cmake/setup_compiler_flags_intel.cmake @@ -20,10 +20,10 @@ # editing this file. # -IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "10.0" ) +IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "15.0" ) MESSAGE(WARNING "\n" "You're using an old version of the Intel C++ Compiler (icc/icpc)!\n" - "It is strongly recommended to use at least version 10.\n" + "It is strongly recommended to use at least version 15.\n" ) ENDIF() -- 2.39.5