diff options
| author | Brad King <brad.king@kitware.com> | 2017-01-11 09:58:31 -0500 |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2017-01-11 09:58:31 -0500 |
| commit | 34745595c3b87279b92ea402fd2ccb6351344307 (patch) | |
| tree | 7b3ef2f4800d119233f452c1858731117ad03d2e /Modules | |
| parent | 0884c9e46a108e8d7b52f6d96242f147ab12d001 (diff) | |
| parent | 3578e86272b16b303edd640f29781dd316a857a4 (diff) | |
| download | cmake-34745595c3b87279b92ea402fd2ccb6351344307.tar.gz | |
Merge topic 'issue-16513-concrt140-dll'
3578e862 InstallRequiredSystemLibraries: Add concrt*.dll for VC >= 14.0
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index b0446c9c18..f4ae091753 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -182,7 +182,10 @@ if(MSVC) "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll" ) if(NOT v VERSION_LESS 14) - list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll") + list(APPEND __install__libs + "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll" + "${MSVC${v}_CRT_DIR}/concrt${v}0.dll" + ) else() list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll") endif() @@ -197,7 +200,10 @@ if(MSVC) "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll" ) if(NOT v VERSION_LESS 14) - list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll") + list(APPEND __install__libs + "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll" + "${MSVC${v}_CRT_DIR}/concrt${v}0d.dll" + ) else() list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll") endif() |