From 61af8d8b3283c3c8a91feb26b9c1ba1d2b972b2f Mon Sep 17 00:00:00 2001 From: Bill Hoffman Date: Thu, 3 Apr 2008 12:29:11 -0400 Subject: [PATCH] ENH: add vs9 mfc libraries --- Modules/InstallRequiredSystemLibraries.cmake | 43 +++++++++++++++++++- 1 file changed, 41 insertions(+), 2 deletions(-) diff --git a/Modules/InstallRequiredSystemLibraries.cmake b/Modules/InstallRequiredSystemLibraries.cmake index 560beec39..2b963bf83 100644 --- a/Modules/InstallRequiredSystemLibraries.cmake +++ b/Modules/InstallRequiredSystemLibraries.cmake @@ -118,8 +118,6 @@ IF(MSVC) "${MSVC80_MFC_DIR}/mfcm80.dll" "${MSVC80_MFC_DIR}/mfcm80u.dll" ) - ENDIF(MSVC80) - IF(MSVC80) # include the language dll's for vs8 as well as the actuall dll's SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFCLOC") # Install the manifest that allows DLLs to be loaded from the @@ -137,6 +135,47 @@ IF(MSVC) "${MSVC80_MFCLOC_DIR}/mfc80kor.dll" ) ENDIF(MSVC80) + IF(MSVC90) + IF(CMAKE_INSTALL_DEBUG_LIBRARIES) + SET(MSVC90_MFC_DIR + "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugMFC") + SET(__install__libs ${__install__libs} + "${MSVC90_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest" + "${MSVC90_MFC_DIR}/mfc90d.dll" + "${MSVC90_MFC_DIR}/mfc90ud.dll" + "${MSVC90_MFC_DIR}/mfcm90d.dll" + "${MSVC90_MFC_DIR}/mfcm90ud.dll" + ) + ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES) + + SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFC") + # Install the manifest that allows DLLs to be loaded from the + # directory containing the executable. + SET(__install__libs ${__install__libs} + "${MSVC90_MFC_DIR}/Microsoft.VC90.MFC.manifest" + "${MSVC90_MFC_DIR}/mfc90.dll" + "${MSVC90_MFC_DIR}/mfc90u.dll" + "${MSVC90_MFC_DIR}/mfcm90.dll" + "${MSVC90_MFC_DIR}/mfcm90u.dll" + ) + # include the language dll's for vs9 as well as the actuall dll's + SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.MFCLOC") + # Install the manifest that allows DLLs to be loaded from the + # directory containing the executable. + SET(__install__libs ${__install__libs} + "${MSVC90_MFCLOC_DIR}/Microsoft.VC90.MFCLOC.manifest" + "${MSVC90_MFCLOC_DIR}/mfc90chs.dll" + "${MSVC90_MFCLOC_DIR}/mfc90cht.dll" + "${MSVC90_MFCLOC_DIR}/mfc90enu.dll" + "${MSVC90_MFCLOC_DIR}/mfc90esp.dll" + "${MSVC90_MFCLOC_DIR}/mfc90deu.dll" + "${MSVC90_MFCLOC_DIR}/mfc90fra.dll" + "${MSVC90_MFCLOC_DIR}/mfc90ita.dll" + "${MSVC90_MFCLOC_DIR}/mfc90jpn.dll" + "${MSVC90_MFCLOC_DIR}/mfc90kor.dll" + ) + ENDIF(MSVC90) + ENDIF(CMAKE_INSTALL_MFC_LIBRARIES) FOREACH(lib ${__install__libs}