[Cmake-commits] [cmake-commits] david.cole committed InstallRequiredSystemLibraries.cmake 1.12 1.13

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Modules
In directory public:/mounts/ram/cvs-serv18360

Modified Files:
	InstallRequiredSystemLibraries.cmake 
Log Message:
BUG: Fix issue #6610. Use 64-bit system binaries when using the 64-bit MSVC compiler. Thanks to Clinton Stimpson for the patch.


Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.12
retrieving revision 1.13
diff -C 2 -d -r1.12 -r1.13
*** InstallRequiredSystemLibraries.cmake	3 Apr 2008 16:29:11 -0000	1.12
--- InstallRequiredSystemLibraries.cmake	30 Jul 2008 19:43:14 -0000	1.13
***************
*** 27,37 ****
        )
    ENDIF(MSVC71)
    IF(MSVC80)
      # Find the runtime library redistribution directory.
!     FIND_PATH(MSVC80_REDIST_DIR NAMES x86/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
        PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist"
        )
      MARK_AS_ADVANCED(MSVC80_REDIST_DIR)
!     SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.CRT")
  
      # Install the manifest that allows DLLs to be loaded from the
--- 27,44 ----
        )
    ENDIF(MSVC71)
+ 
+   IF(CMAKE_CL_64)
+     SET(CMAKE_MSVC_ARCH amd64)
+   ELSE(CMAKE_CL_64)
+     SET(CMAKE_MSVC_ARCH x86)
+   ENDIF(CMAKE_CL_64)
+ 
    IF(MSVC80)
      # Find the runtime library redistribution directory.
!     FIND_PATH(MSVC80_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT/Microsoft.VC80.CRT.manifest
        PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\8.0;InstallDir]/../../VC/redist"
        )
      MARK_AS_ADVANCED(MSVC80_REDIST_DIR)
!     SET(MSVC80_CRT_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.CRT")
  
      # Install the manifest that allows DLLs to be loaded from the
***************
*** 46,50 ****
      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
        SET(MSVC80_CRT_DIR
!         "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugCRT")
        SET(__install__libs ${__install__libs}
          "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
--- 53,57 ----
      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
        SET(MSVC80_CRT_DIR
!         "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugCRT")
        SET(__install__libs ${__install__libs}
          "${MSVC80_CRT_DIR}/Microsoft.VC80.DebugCRT.manifest"
***************
*** 58,62 ****
    IF(MSVC90)
      # Find the runtime library redistribution directory.
!     FIND_PATH(MSVC90_REDIST_DIR NAMES x86/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
        PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist"
        
--- 65,69 ----
    IF(MSVC90)
      # Find the runtime library redistribution directory.
!     FIND_PATH(MSVC90_REDIST_DIR NAMES ${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT/Microsoft.VC90.CRT.manifest
        PATHS "[HKEY_LOCAL_MACHINE\\SOFTWARE\\Microsoft\\VisualStudio\\9.0;InstallDir]/../../VC/redist"
        
***************
*** 64,68 ****
        )
      MARK_AS_ADVANCED(MSVC90_REDIST_DIR)
!     SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/x86/Microsoft.VC90.CRT")
      
      # Install the manifest that allows DLLs to be loaded from the
--- 71,75 ----
        )
      MARK_AS_ADVANCED(MSVC90_REDIST_DIR)
!     SET(MSVC90_CRT_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.CRT")
      
      # Install the manifest that allows DLLs to be loaded from the
***************
*** 76,80 ****
      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
        SET(MSVC90_CRT_DIR
!         "${MSVC90_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC90.DebugCRT")
        SET(__install__libs ${__install__libs}
          "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest"
--- 83,87 ----
      IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
        SET(MSVC90_CRT_DIR
!         "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugCRT")
        SET(__install__libs ${__install__libs}
          "${MSVC90_CRT_DIR}/Microsoft.VC90.DebugCRT.manifest"
***************
*** 99,103 ****
        IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          SET(MSVC80_MFC_DIR
!           "${MSVC80_REDIST_DIR}/Debug_NonRedist/x86/Microsoft.VC80.DebugMFC")
          SET(__install__libs ${__install__libs}
            "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
--- 106,110 ----
        IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          SET(MSVC80_MFC_DIR
!           "${MSVC80_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC80.DebugMFC")
          SET(__install__libs ${__install__libs}
            "${MSVC80_MFC_DIR}/Microsoft.VC80.DebugMFC.manifest"
***************
*** 109,113 ****
        ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          
!       SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/x86/Microsoft.VC80.MFC")
        # Install the manifest that allows DLLs to be loaded from the
        # directory containing the executable.
--- 116,120 ----
        ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          
!       SET(MSVC80_MFC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFC")
        # Install the manifest that allows DLLs to be loaded from the
        # directory containing the executable.
***************
*** 120,124 ****
          )
        # 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
        # directory containing the executable.
--- 127,131 ----
          )
        # include the language dll's for vs8 as well as the actuall dll's
!       SET(MSVC80_MFCLOC_DIR "${MSVC80_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC80.MFCLOC")
        # Install the manifest that allows DLLs to be loaded from the
        # directory containing the executable.
***************
*** 139,143 ****
        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"
--- 146,150 ----
        IF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          SET(MSVC90_MFC_DIR
!           "${MSVC90_REDIST_DIR}/Debug_NonRedist/${CMAKE_MSVC_ARCH}/Microsoft.VC90.DebugMFC")
          SET(__install__libs ${__install__libs}
            "${MSVC90_MFC_DIR}/Microsoft.VC90.DebugMFC.manifest"
***************
*** 149,153 ****
        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.
--- 156,160 ----
        ENDIF(CMAKE_INSTALL_DEBUG_LIBRARIES)
          
!       SET(MSVC90_MFC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFC")
        # Install the manifest that allows DLLs to be loaded from the
        # directory containing the executable.
***************
*** 160,164 ****
          )
        # 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.
--- 167,171 ----
          )
        # include the language dll's for vs9 as well as the actuall dll's
!       SET(MSVC90_MFCLOC_DIR "${MSVC90_REDIST_DIR}/${CMAKE_MSVC_ARCH}/Microsoft.VC90.MFCLOC")
        # Install the manifest that allows DLLs to be loaded from the
        # directory containing the executable.