diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-06 13:18:02 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-06 13:18:28 (GMT) |
| commit | b9ee95fe5e621037f415de675eb378504170a056 (patch) | |
| tree | 547f28dd693d0945be3f0ed765f93283552a51b5 | |
| parent | 0f27e7d165c96f2c3ada1695df4f6cfaa44afe51 (diff) | |
| parent | 541f079bd7ba7f141218ed93177af4d848e516fa (diff) | |
| download | CMake-b9ee95fe5e621037f415de675eb378504170a056.zip CMake-b9ee95fe5e621037f415de675eb378504170a056.tar.gz CMake-b9ee95fe5e621037f415de675eb378504170a056.tar.bz2 | |
Merge topic 'findice-clang-cl'
541f079bd7 FindIce: Support clang-cl by checking CMAKE_CXX_SIMULATE_ID
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !3284
| -rw-r--r-- | Modules/FindIce.cmake | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/FindIce.cmake b/Modules/FindIce.cmake index 1e0f0b8..5ce2b42 100644 --- a/Modules/FindIce.cmake +++ b/Modules/FindIce.cmake @@ -259,7 +259,7 @@ function(_Ice_FIND) endif() unset(vcvers) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") if(MSVC_TOOLSET_VERSION GREATER_EQUAL 141) set(vcvers "141;140") elseif(MSVC_TOOLSET_VERSION GREATER_EQUAL 100) @@ -435,7 +435,7 @@ function(_Ice_FIND) set(component_library "${component}") unset(component_library_release_names) unset(component_library_debug_names) - if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") + if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC" OR "${CMAKE_CXX_SIMULATE_ID}" STREQUAL "MSVC") string(REGEX MATCH ".+\\+\\+11$" component_library_cpp11 "${component_library}") if(component_library_cpp11) string(REGEX REPLACE "^(.+)(\\+\\+11)$" "\\1" component_library "${component_library}") |