summaryrefslogtreecommitdiffstats
path: root/Modules/InstallRequiredSystemLibraries.cmake
diff options
context:
space:
mode:
authorBjoern Thiel <bjoern.thiel@mpibpc.mpg.de>2014-06-16 13:13:47 (GMT)
committerBrad King <brad.king@kitware.com>2014-06-16 19:36:25 (GMT)
commit15a19c31e51a43379929cfd948111f4f2fba1584 (patch)
tree5769c0dd158ec4a853e4022dc7d85f03cc70d801 /Modules/InstallRequiredSystemLibraries.cmake
parent6b05e03de4353275d1e2e614150757397bd1f855 (diff)
downloadCMake-15a19c31e51a43379929cfd948111f4f2fba1584.zip
CMake-15a19c31e51a43379929cfd948111f4f2fba1584.tar.gz
CMake-15a19c31e51a43379929cfd948111f4f2fba1584.tar.bz2
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.
Diffstat (limited to 'Modules/InstallRequiredSystemLibraries.cmake')
-rw-r--r--Modules/InstallRequiredSystemLibraries.cmake6
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)