[Cmake-commits] [cmake-commits] hoffman committed FindQt4.cmake 1.96.2.5 1.96.2.6 InstallRequiredSystemLibraries.cmake 1.11 1.11.2.1

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	FindQt4.cmake InstallRequiredSystemLibraries.cmake 
Log Message:
ENH: merge in changes from main tree


Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.11
retrieving revision 1.11.2.1
diff -C 2 -d -r1.11 -r1.11.2.1
*** InstallRequiredSystemLibraries.cmake	29 Feb 2008 19:36:33 -0000	1.11
--- InstallRequiredSystemLibraries.cmake	8 Apr 2008 16:22:48 -0000	1.11.2.1
***************
*** 119,124 ****
          "${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")
--- 119,122 ----
***************
*** 138,141 ****
--- 136,180 ----
          )
      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

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.96.2.5
retrieving revision 1.96.2.6
diff -C 2 -d -r1.96.2.5 -r1.96.2.6
*** FindQt4.cmake	2 Apr 2008 15:07:52 -0000	1.96.2.5
--- FindQt4.cmake	8 Apr 2008 16:22:47 -0000	1.96.2.6
***************
*** 993,997 ****
    # macro used to create the names of output files preserving relative dirs
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
!     FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
      GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)
--- 993,1007 ----
    # macro used to create the names of output files preserving relative dirs
    MACRO (QT4_MAKE_OUTPUT_FILE infile prefix ext outfile )
!     STRING(LENGTH ${CMAKE_CURRENT_BINARY_DIR} _binlength)
!     STRING(LENGTH ${infile} _infileLength)
!     SET(_checkinfile ${CMAKE_CURRENT_SOURCE_DIR})
!     IF(_infileLength GREATER _binlength)
!       STRING(SUBSTRING "${infile}" 0 ${_binlength} _checkinfile)
!     ENDIF(_infileLength GREATER _binlength)
!     IF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
!       FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_BINARY_DIR} ${infile})
!     ELSE(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
!       FILE(RELATIVE_PATH rel ${CMAKE_CURRENT_SOURCE_DIR} ${infile})
!     ENDIF(CMAKE_CURRENT_BINARY_DIR MATCHES "${_checkinfile}")
      SET(_outfile "${CMAKE_CURRENT_BINARY_DIR}/${rel}")
      GET_FILENAME_COMPONENT(outpath ${_outfile} PATH)