Skip to content

Commit

Permalink
- add missing compiler version check for Intel (#6734)
Browse files Browse the repository at this point in the history
Signed-off-by: SSE4 <tomskside@gmail.com>
  • Loading branch information
SSE4 committed Apr 29, 2020
1 parent 53a7d42 commit 6a9ef49
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions conans/client/generators/cmake_common.py
Expand Up @@ -503,6 +503,17 @@ class CMakeCommonMacros:
if(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
conan_error_compiler_version()
endif()
elseif(CONAN_COMPILER STREQUAL "intel")
if(NOT ${CONAN_COMPILER_VERSION} VERSION_LESS 19.1)
conan_split_version(${CONAN_COMPILER_VERSION} CONAN_COMPILER_MAJOR CONAN_COMPILER_MINOR)
if(NOT ${VERSION_MAJOR}.${VERSION_MINOR} VERSION_EQUAL ${CONAN_COMPILER_MAJOR}.${CONAN_COMPILER_MINOR})
conan_error_compiler_version()
endif()
else()
if(NOT ${VERSION_MAJOR} VERSION_EQUAL ${CONAN_COMPILER_VERSION})
conan_error_compiler_version()
endif()
endif()
else()
conan_message(STATUS "WARN: Unknown compiler '${CONAN_COMPILER}', skipping the version check...")
endif()
Expand Down

0 comments on commit 6a9ef49

Please sign in to comment.