From 3290f8e637c4e0a51e9191e0dd9c0a6df90ea9f0 Mon Sep 17 00:00:00 2001 From: Andreas Willadsen Date: Tue, 23 Feb 2021 11:01:29 +0100 Subject: [PATCH] Intel compiler support for linux (#288) * Intel compiler support for linux Implemented changes proposed by issue #166 * Update conan.cmake Co-authored-by: Carlos Zoido --- conan.cmake | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/conan.cmake b/conan.cmake index f1fb0036..bc8463ad 100644 --- a/conan.cmake +++ b/conan.cmake @@ -143,6 +143,17 @@ function(conan_cmake_settings result) conan_cmake_detect_unix_libcxx(_LIBCXX) set(_CONAN_SETTING_COMPILER_LIBCXX ${_LIBCXX}) endif () + elseif (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL Intel) + string(REPLACE "." ";" VERSION_LIST ${CMAKE_${LANGUAGE}_COMPILER_VERSION}) + list(GET VERSION_LIST 0 MAJOR) + list(GET VERSION_LIST 1 MINOR) + set(COMPILER_VERSION ${MAJOR}.${MINOR}) + set(_CONAN_SETTING_COMPILER intel) + set(_CONAN_SETTING_COMPILER_VERSION ${COMPILER_VERSION}) + if (USING_CXX) + conan_cmake_detect_unix_libcxx(_LIBCXX) + set(_CONAN_SETTING_COMPILER_LIBCXX ${_LIBCXX}) + endif () elseif (${CMAKE_${LANGUAGE}_COMPILER_ID} STREQUAL AppleClang) # using AppleClang string(REPLACE "." ";" VERSION_LIST ${CMAKE_${LANGUAGE}_COMPILER_VERSION})