From 15a19c31e51a43379929cfd948111f4f2fba1584 Mon Sep 17 00:00:00 2001 From: Bjoern Thiel Date: Mon, 16 Jun 2014 06:13:47 -0700 Subject: [PATCH] InstallRequiredSystemLibraries: Allow repeat use per-config To be able to include InstallRequiredSystemLibraries more than once (e.g. to get the Debug and Release libraries separately), clear the internal library list for non-matching configuration. --- Modules/InstallRequiredSystemLibraries.cmake | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 5c439e98c..2fc8c04e7 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)