Skip to content

Commit

Permalink
Intel compiler support for linux (#288)
Browse files Browse the repository at this point in the history
* Intel compiler support for linux

Implemented changes proposed by issue #166

* Update conan.cmake

Co-authored-by: Carlos Zoido <mrgalleta@gmail.com>
  • Loading branch information
willadsen and czoido authored Feb 23, 2021
1 parent bb84557 commit 3290f8e
Showing 1 changed file with 11 additions and 0 deletions.
11 changes: 11 additions & 0 deletions conan.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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})
Expand Down

0 comments on commit 3290f8e

Please sign in to comment.