From 539c7ba6afb4810a7decd75850b6eb272ea8aeac Mon Sep 17 00:00:00 2001 From: Andy Cedilnik Date: Tue, 21 Mar 2006 16:58:41 -0500 Subject: [PATCH] ENH: Handle visual studio versions --- Modules/InstallRequiredSystemLibraries.cmake | 66 +++++++++++++++++--- 1 file changed, 57 insertions(+), 9 deletions(-) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 071bb2b54..404058d82 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -4,26 +4,74 @@ # developers. IF(MSVC) STRING(REGEX REPLACE "\\\\" "/" SYSTEMROOT "$ENV{SYSTEMROOT}") - FOREACH(lib - "${SYSTEMROOT}/system32/mfc71.dll" + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7") + SET(MSVC70 1) + SET(MSVC71) + SET(MSVC80) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7") + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003") + SET(MSVC70) + SET(MSVC71 1) + SET(MSVC80) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 7 .NET 2003") + IF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + SET(MSVC70) + SET(MSVC71) + SET(MSVC80 1) + ENDIF(CMAKE_GENERATOR STREQUAL "Visual Studio 8 2005") + IF(MSVC70) + SET(__install__libs + "${SYSTEMROOT}/system32/msvcp70.dll" + "${SYSTEMROOT}/system32/msvcr70.dll" + ) + ENDIF(MSVC70) + IF(MSVC71) + SET(__install__libs "${SYSTEMROOT}/system32/msvcp71.dll" "${SYSTEMROOT}/system32/msvcr71.dll" ) + ENDIF(MSVC71) + IF(MSVC80) + SET(__install__libs + "${SYSTEMROOT}/system32/msvcp80.dll" + "${SYSTEMROOT}/system32/msvcr80.dll" + ) + ENDIF(MSVC80) + IF(CMAKE_INSTALL_MFC_LIBRARIES) + IF(MSVC70) + SET(__install__libs + "${SYSTEMROOT}/system32/mfc70.dll" + ) + ENDIF(MSVC70) + IF(MSVC71) + SET(__install__libs + "${SYSTEMROOT}/system32/mfc71.dll" + ) + ENDIF(MSVC71) + IF(MSVC80) + SET(__install__libs + "${SYSTEMROOT}/system32/mfc80.dll" + ) + ENDIF(MSVC80) + ENDIF(CMAKE_INSTALL_MFC_LIBRARIES) + FOREACH(lib + ${__install__libs} + ) IF(EXISTS ${lib}) - SET(CMake_INSTALL_SYSTEM_RUNTIME_LIBS - ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) + SET(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS + ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS} ${lib}) ENDIF(EXISTS ${lib}) ENDFOREACH(lib) ENDIF(MSVC) # Include system runtime libraries in the installation if any are -# specified by CMake_INSTALL_SYSTEM_RUNTIME_LIBS. -IF(CMake_INSTALL_SYSTEM_RUNTIME_LIBS) +# specified by CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS. +IF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS) IF(WIN32) - INSTALL_PROGRAMS(/bin ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS}) + INSTALL_PROGRAMS(/bin ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}) ELSE(WIN32) - INSTALL_PROGRAMS(/lib ${CMake_INSTALL_SYSTEM_RUNTIME_LIBS}) + INSTALL_PROGRAMS(/lib ${CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS}) ENDIF(WIN32) -ENDIF(CMake_INSTALL_SYSTEM_RUNTIME_LIBS) +ENDIF(CMAKE_INSTALL_SYSTEM_RUNTIME_LIBS)