diff options
| author | Roger Leigh <rleigh@dundee.ac.uk> | 2017-11-27 16:16:34 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-27 18:48:22 (GMT) |
| commit | 00e39a4afcb65b3c78acc81e6080c204be84f16f (patch) | |
| tree | dd88c8b26a8eb77c44c9198c07bc1d1c68be3628 /Modules/FindBoost.cmake | |
| parent | 65f21a7eadc2144f0c85cd883cf63a6eb7681528 (diff) | |
| download | CMake-00e39a4afcb65b3c78acc81e6080c204be84f16f.zip CMake-00e39a4afcb65b3c78acc81e6080c204be84f16f.tar.gz CMake-00e39a4afcb65b3c78acc81e6080c204be84f16f.tar.bz2 | |
FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler
Diffstat (limited to 'Modules/FindBoost.cmake')
| -rw-r--r-- | Modules/FindBoost.cmake | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 6f60eeb..b1805ce 100644 --- a/Modules/FindBoost.cmake +++ b/Modules/FindBoost.cmake @@ -429,9 +429,7 @@ endfunction() # Guesses Boost's compiler prefix used in built library names # Returns the guess by setting the variable pointed to by _ret function(_Boost_GUESS_COMPILER_PREFIX _ret) - if(CMAKE_CXX_COMPILER_ID STREQUAL "Intel" - OR CMAKE_CXX_COMPILER MATCHES "icl" - OR CMAKE_CXX_COMPILER MATCHES "icpc") + if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel") if(WIN32) set (_boost_COMPILER "-iw") else() @@ -1395,8 +1393,7 @@ endif() # support libraries if(WIN32 AND Boost_USE_DEBUG_RUNTIME) if("x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xMSVC" - OR "${CMAKE_CXX_COMPILER}" MATCHES "icl" - OR "${CMAKE_CXX_COMPILER}" MATCHES "icpc") + OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel") string(APPEND _boost_DEBUG_ABI_TAG "g") endif() endif() |