DRTVWR-476, SL-12205: Search for msvcp140.dll, not msvcr140.dll

Evidently, with VS 2017, what would have been msvcr140.dll has become
vcruntime140.dll instead. msvcr140.dll is no longer a good sample DLL for
which to search.
meow-7.2.2
Nat Goodspeed 2019-10-31 14:46:11 -04:00
parent 4ab5e79cf4
commit 1493210a40
1 changed files with 4 additions and 1 deletions

View File

@ -94,7 +94,7 @@ if(WINDOWS)
set(registry_find_path "[HKEY_LOCAL_MACHINE\\SYSTEM\\CurrentControlSet\\Control\\Windows;Directory]/System32")
endif(ADDRESS_SIZE EQUAL 32)
FIND_PATH(release_msvc_redist_path NAME msvcr${MSVC_VER}.dll
FIND_PATH(release_msvc_redist_path NAME msvcp${MSVC_VER}.dll
PATHS
${registry_find_path}
NO_DEFAULT_PATH
@ -122,8 +122,11 @@ if(WINDOWS)
${release_msvc_files}
)
set(third_party_targets ${third_party_targets} ${out_targets})
MESSAGE(STATUS "Copied ${third_party_targets}")
unset(release_msvc_redist_path CACHE)
else()
MESSAGE(SEND_ERROR "Redist libs for VC ${MSVC_VER} not found!")
endif()
elseif(DARWIN)