From 55bd823339216553db5958d5d527fb36c2f6d46a Mon Sep 17 00:00:00 2001
From: Christoph Junghans <junghans@lanl.gov>
Date: Fri, 11 May 2018 17:48:31 -0600
Subject: [PATCH] cmake: fix icc versioning

---
 cmake/CMakeLists.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cmake/CMakeLists.txt b/cmake/CMakeLists.txt
index 0f91452123..94da9a2f3e 100644
--- a/cmake/CMakeLists.txt
+++ b/cmake/CMakeLists.txt
@@ -609,13 +609,13 @@ if(PKG_USER-INTEL)
       if(NOT CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
         message(FATAL_ERROR "USER-INTEL is only useful together with intel compiler")
       endif()
-      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "2016")
-        message(FATAL_ERROR "USER-INTEL is needed at least 2016 intel compiler")
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_LESS 16)
+        message(FATAL_ERROR "USER-INTEL is needed at least 2016 intel compiler, found ${CMAKE_CXX_COMPILER_VERSION}")
       endif()
     endif()
     option(INJECT_INTEL_FLAG "Inject OMG fast flags for USER-INTEL" ON)
     if(INJECT_INTEL_FLAG AND CMAKE_CXX_COMPILER_ID STREQUAL "Intel")
-      if(CMAKE_CXX_COMPILER_VERSION MATCHES "^2017\.[34].*")
+      if(CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.3 OR CMAKE_CXX_COMPILER_VERSION VERSION_EQUAL 17.4)
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xCOMMON-AVX512")
       else()
         set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -xHost")
-- 
GitLab