Commit ca0cd31a authored by Brad King's avatar Brad King Committed by Kitware Robot
Browse files

Merge topic 'InstallRequiredSystemLibraries-repeat'

15a19c31 InstallRequiredSystemLibraries: Allow repeat use per-config
parents 562d5f57 15a19c31
...@@ -94,6 +94,8 @@ if(MSVC) ...@@ -94,6 +94,8 @@ if(MSVC)
"${MSVC80_CRT_DIR}/msvcp80.dll" "${MSVC80_CRT_DIR}/msvcp80.dll"
"${MSVC80_CRT_DIR}/msvcr80.dll" "${MSVC80_CRT_DIR}/msvcr80.dll"
) )
else()
set(__install__libs)
endif() endif()
if(CMAKE_INSTALL_DEBUG_LIBRARIES) if(CMAKE_INSTALL_DEBUG_LIBRARIES)
...@@ -132,6 +134,8 @@ if(MSVC) ...@@ -132,6 +134,8 @@ if(MSVC)
"${MSVC90_CRT_DIR}/msvcp90.dll" "${MSVC90_CRT_DIR}/msvcp90.dll"
"${MSVC90_CRT_DIR}/msvcr90.dll" "${MSVC90_CRT_DIR}/msvcr90.dll"
) )
else()
set(__install__libs)
endif() endif()
if(CMAKE_INSTALL_DEBUG_LIBRARIES) if(CMAKE_INSTALL_DEBUG_LIBRARIES)
...@@ -168,6 +172,8 @@ if(MSVC) ...@@ -168,6 +172,8 @@ if(MSVC)
"${MSVC${v}_CRT_DIR}/msvcp${v}0.dll" "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
"${MSVC${v}_CRT_DIR}/msvcr${v}0.dll" "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
) )
else()
set(__install__libs)
endif() endif()
if(CMAKE_INSTALL_DEBUG_LIBRARIES) if(CMAKE_INSTALL_DEBUG_LIBRARIES)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment