diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-29 13:23:01 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-29 13:23:11 (GMT) |
| commit | 9e961930ee1ab526467651935bf7c285c170432d (patch) | |
| tree | 207d9d845e51c1c6fd95fdb74c9eb5d3f1decf3a /Modules | |
| parent | 04f869bb4645aae8171f70746898ca20d3c05be1 (diff) | |
| parent | 458c589fe33fb5e827e9dbcd7799a0cac2559dba (diff) | |
| download | CMake-9e961930ee1ab526467651935bf7c285c170432d.zip CMake-9e961930ee1ab526467651935bf7c285c170432d.tar.gz CMake-9e961930ee1ab526467651935bf7c285c170432d.tar.bz2 | |
Merge topic 'win-clang-debug'
458c589f FindBoost: Add Windows ABI tag for Clang debug
00e39a4a FindBoost: Use CMAKE_CXX_COMPILER_ID for Intel compiler
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1529
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindBoost.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/FindBoost.cmake b/Modules/FindBoost.cmake index 6f60eeb..0786248 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,8 @@ 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 "xClang" + OR "x${CMAKE_CXX_COMPILER_ID}" STREQUAL "xIntel") string(APPEND _boost_DEBUG_ABI_TAG "g") endif() endif() |