kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'InstallRequiredSystemLibraries-vs2015'

Browse Source 
9b2778d4 InstallRequiredSystemLibraries: Update for VS 2015 (#15552)
This commit is contained in:
Brad King 2015-05-05 09:35:25 -04:00 committed by CMake Topic Stage
commit 2d02986b7c
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Modules/InstallRequiredSystemLibraries.cmake
View File

@ -185,8 +185,12 @@ if(MSVC)
if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY) if(NOT CMAKE_INSTALL_DEBUG_LIBRARIES_ONLY)
set(__install__libs set(__install__libs
"${MSVC${v}_CRT_DIR}/msvcp${v}0.dll" "${MSVC${v}_CRT_DIR}/msvcp${v}0.dll"
"${MSVC${v}_CRT_DIR}/msvcr${v}0.dll"
) )
if(NOT v VERSION_LESS 14)
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0.dll")
else()
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0.dll")
endif()
else() else()
set(__install__libs) set(__install__libs)
endif() endif()
@ -196,8 +200,12 @@ if(MSVC)
"${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT") "${MSVC${v}_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC${v}0.DebugCRT")
set(__install__libs ${__install__libs} set(__install__libs ${__install__libs}
"${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll" "${MSVC${v}_CRT_DIR}/msvcp${v}0d.dll"
"${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll"
) )
if(NOT v VERSION_LESS 14)
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/vcruntime${v}0d.dll")
else()
list(APPEND __install__libs "${MSVC${v}_CRT_DIR}/msvcr${v}0d.dll")
endif()
endif() endif()
endmacro() endmacro()