diff options
| author | Brad King <brad.king@kitware.com> | 2014-06-23 14:27:52 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-06-23 14:27:52 (GMT) |
| commit | ca0cd31a0f5008700e1a6cbb346eb8087d8f0785 (patch) | |
| tree | a7bed9d01bd2819b4c9818540be3175565c6eb38 | |
| parent | 562d5f576ab31771d2e02258eaad8afdf4d12f00 (diff) | |
| parent | 15a19c31e51a43379929cfd948111f4f2fba1584 (diff) | |
| download | CMake-ca0cd31a0f5008700e1a6cbb346eb8087d8f0785.zip CMake-ca0cd31a0f5008700e1a6cbb346eb8087d8f0785.tar.gz CMake-ca0cd31a0f5008700e1a6cbb346eb8087d8f0785.tar.bz2 | |
Merge topic 'InstallRequiredSystemLibraries-repeat'
15a19c31 InstallRequiredSystemLibraries: Allow repeat use per-config
| -rw-r--r-- | Modules/InstallRequiredSystemLibraries.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 5c439e9..2fc8c04 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -94,6 +94,8 @@ if(MSVC) "${MSVC80_CRT_DIR}/msvcp80.dll" "${MSVC80_CRT_DIR}/msvcr80.dll" ) + else() + set(__install__libs) endif() if(CMAKE_INSTALL_DEBUG_LIBRARIES) @@ -132,6 +134,8 @@ if(MSVC) "${MSVC90_CRT_DIR}/msvcp90.dll" "${MSVC90_CRT_DIR}/msvcr90.dll" ) + else() + set(__install__libs) endif() if(CMAKE_INSTALL_DEBUG_LIBRARIES) @@ -168,6 +172,8 @@ if(MSVC) "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll" "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll" ) + else() + set(__install__libs) endif() if(CMAKE_INSTALL_DEBUG_LIBRARIES) |