diff options
| -rw-r--r-- | Modules/FindIce.cmake | 4 | ||||
| -rw-r--r-- | Source/CMakeVersion.cmake | 2 |
2 files changed, 3 insertions, 3 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}") diff --git a/Source/CMakeVersion.cmake b/Source/CMakeVersion.cmake index a6c9d01..6bedd4e 100644 --- a/Source/CMakeVersion.cmake +++ b/Source/CMakeVersion.cmake @@ -1,5 +1,5 @@ # CMake version number components. set(CMake_VERSION_MAJOR 3) set(CMake_VERSION_MINOR 14) -set(CMake_VERSION_PATCH 20190503) +set(CMake_VERSION_PATCH 20190506) #set(CMake_VERSION_RC 1) |