[cmake-commits] hoffman committed FindQt4.cmake 1.25.2.10 1.25.2.11 InstallRequiredSystemLibraries.cmake 1.3.2.1 1.3.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	FindQt4.cmake InstallRequiredSystemLibraries.cmake 
Log Message:
ENH: merge in changes from main tree, including fix for exception stuff in vs 7


Index: InstallRequiredSystemLibraries.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/InstallRequiredSystemLibraries.cmake,v
retrieving revision 1.3.2.1
retrieving revision 1.3.2.2
diff -u -d -r1.3.2.1 -r1.3.2.2
--- InstallRequiredSystemLibraries.cmake	13 Oct 2006 14:52:01 -0000	1.3.2.1
+++ InstallRequiredSystemLibraries.cmake	15 Feb 2007 17:45:07 -0000	1.3.2.2
@@ -51,6 +51,9 @@
       SET(__install__libs ${__install__libs}
         "${MSVC80_MFC_DIR}/Microsoft.VC80.MFC.manifest"
         "${MSVC80_MFC_DIR}/mfc80.dll"
+        "${MSVC80_MFC_DIR}/mfc80u.dll"
+        "${MSVC80_MFC_DIR}/mfcm80.dll"
+        "${MSVC80_MFC_DIR}/mfcm80u.dll"
         )
     ENDIF(MSVC80)
   ENDIF(CMAKE_INSTALL_MFC_LIBRARIES)

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.25.2.10
retrieving revision 1.25.2.11
diff -u -d -r1.25.2.10 -r1.25.2.11
--- FindQt4.cmake	13 Nov 2006 20:25:16 -0000	1.25.2.10
+++ FindQt4.cmake	15 Feb 2007 17:45:07 -0000	1.25.2.11
@@ -484,6 +484,7 @@
     PATHS
     ${QT_INCLUDE_DIR}/QtAssistant
     ${QT_HEADERS_DIR}/QtAssistant
+    ${QT_LIBRARY_DIR}/QtAssistant.framework/Headers
     NO_DEFAULT_PATH
     )
 
@@ -492,6 +493,7 @@
     PATHS
     ${QT_INCLUDE_DIR}/QtDesigner
     ${QT_HEADERS_DIR}/QtDesigner
+    ${QT_LIBRARY_DIR}/QtDesigner.framework/Headers
     NO_DEFAULT_PATH
     )