diff options
| author | Brad King <brad.king@kitware.com> | 2021-01-18 16:14:15 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-01-18 16:14:22 (GMT) |
| commit | 16ad286ead0d588a89c7a9b8f6b661c695555a55 (patch) | |
| tree | 11de0f4235ed5269269a85cc42fbde7c23b6c0a5 | |
| parent | 19ff734e76a35d59eb0f973197cadb1c271c766c (diff) | |
| parent | 6718caaa2f6070a70ccb2d7efe1652d27c9b4902 (diff) | |
| download | CMake-16ad286ead0d588a89c7a9b8f6b661c695555a55.zip CMake-16ad286ead0d588a89c7a9b8f6b661c695555a55.tar.gz CMake-16ad286ead0d588a89c7a9b8f6b661c695555a55.tar.bz2 | |
Merge topic 'irsl-msvcp_atomic_wait_dll' into release-3.19
6718caaa2f IRSL: Install msvcp${v}${d}_atomic_wait.dll if available with CRT
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5702
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index caca697..29d1ec0 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -291,6 +291,7 @@ if(MSVC) foreach(crt "${MSVC_CRT_DIR}/msvcp${v}_1.dll" "${MSVC_CRT_DIR}/msvcp${v}_2.dll" + "${MSVC_CRT_DIR}/msvcp${v}_atomic_wait.dll" "${MSVC_CRT_DIR}/msvcp${v}_codecvt_ids.dll" "${MSVC_CRT_DIR}/vcruntime${v}_1.dll" ) @@ -319,6 +320,7 @@ if(MSVC) foreach(crt "${MSVC_CRT_DIR}/msvcp${v}_1d.dll" "${MSVC_CRT_DIR}/msvcp${v}_2d.dll" + "${MSVC_CRT_DIR}/msvcp${v}d_atomic_wait.dll" "${MSVC_CRT_DIR}/msvcp${v}d_codecvt_ids.dll" "${MSVC_CRT_DIR}/vcruntime${v}_1d.dll" ) |