From 06b6308ab4300008fa3cef009f3fa0f05647fde4 Mon Sep 17 00:00:00 2001 From: Brad King Date: Thu, 16 Feb 2006 20:15:03 -0500 Subject: [PATCH] BUG: Do not install MSVC dlls for a non-MSVC build. --- Modules/CPack.cmake | 4 ++-- Utilities/Release/Release.cmake | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Modules/CPack.cmake b/Modules/CPack.cmake index a320ce785..e0295a2a8 100644 --- a/Modules/CPack.cmake +++ b/Modules/CPack.cmake @@ -50,7 +50,7 @@ SET(CPACK_BINARY_DIR "${CMAKE_BINARY_DIR}") # Search for system runtime libraries based on the platform. This is # not complete because it is used only for the release process by the # developers. -IF(WIN32 AND NOT CYGWIN) +IF(MSVC) STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") FOREACH(lib "${SYSTEMROOT}/system32/mfc71.dll" @@ -62,7 +62,7 @@ IF(WIN32 AND NOT CYGWIN) ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) ENDIF(EXISTS ${lib}) ENDFOREACH(lib) -ENDIF(WIN32 AND NOT CYGWIN) +ENDIF(MSVC) # Include system runtime libraries in the installation if any are # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS. diff --git a/Utilities/Release/Release.cmake b/Utilities/Release/Release.cmake index cda525514..c242724ed 100644 --- a/Utilities/Release/Release.cmake +++ b/Utilities/Release/Release.cmake @@ -4,7 +4,7 @@ # Search for system runtime libraries based on the platform. This is # not complete because it is used only for the release process by the # developers. -IF(WIN32 AND NOT CYGWIN) +IF(MSVC) STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") FOREACH(lib "${SYSTEMROOT}/system32/mfc71.dll" @@ -16,7 +16,7 @@ IF(WIN32 AND NOT CYGWIN) ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) ENDIF(EXISTS ${lib}) ENDFOREACH(lib) -ENDIF(WIN32 AND NOT CYGWIN) +ENDIF(MSVC) # Include system runtime libraries in the installation if any are # specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS.