[cmake-commits] hoffman committed FindMPI.cmake 1.10 1.10.2.1 FindQt4.cmake 1.25.2.8 1.25.2.9 readme.txt 1.7.2.2 1.7.2.3

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-4
	FindMPI.cmake FindQt4.cmake readme.txt 
Log Message:
ENH: merge from main tree fix for vs all build qt and mpi2


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.10
retrieving revision 1.10.2.1
diff -u -d -r1.10 -r1.10.2.1
--- FindMPI.cmake	28 Feb 2006 15:27:30 -0000	1.10
+++ FindMPI.cmake	10 Nov 2006 15:12:55 -0000	1.10.2.1
@@ -10,13 +10,15 @@
           /usr/include/mpi
           /usr/local/mpi/include
           "$ENV{ProgramFiles}/MPICH/SDK/Include"
+          "$ENV{ProgramFiles}/MPICH2/include"
           "C:/Program Files/MPICH/SDK/Include" 
 )
 
 FIND_LIBRARY(MPI_LIBRARY 
-             NAMES mpi mpich
+             NAMES mpich2 mpi mpich 
              PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
+             "$ENV{ProgramFiles}/MPICH2/Lib"
              "C:/Program Files/MPICH/SDK/Lib" 
 )
 

Index: FindQt4.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindQt4.cmake,v
retrieving revision 1.25.2.8
retrieving revision 1.25.2.9
diff -u -d -r1.25.2.8 -r1.25.2.9
--- FindQt4.cmake	27 Oct 2006 20:01:46 -0000	1.25.2.8
+++ FindQt4.cmake	10 Nov 2006 15:12:55 -0000	1.25.2.9
@@ -560,8 +560,8 @@
   ENDIF( NOT QT_QTCORE_LIBRARY_DEBUG AND NOT QT_QTCORE_LIBRARY_RELEASE )
 
   # Set QT_QTASSISTANT_LIBRARY
-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
-  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClientd QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_RELEASE NAMES QtAssistantClient QtAssistantClient4 QtAssistant QtAssistant4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+  FIND_LIBRARY(QT_QTASSISTANT_LIBRARY_DEBUG   NAMES QtAssistantClientd QtAssistantClientd4 QtAssistantClient_debug QtAssistant_debug QtAssistantd4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
 
   # Set QT_QTDESIGNER_LIBRARY
   FIND_LIBRARY(QT_QTDESIGNER_LIBRARY_RELEASE NAMES QtDesigner QtDesigner4 PATHS ${QT_LIBRARY_DIR}        NO_DEFAULT_PATH)

Index: readme.txt
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/readme.txt,v
retrieving revision 1.7.2.2
retrieving revision 1.7.2.3
diff -u -d -r1.7.2.2 -r1.7.2.3
--- readme.txt	13 Oct 2006 14:52:01 -0000	1.7.2.2
+++ readme.txt	10 Nov 2006 15:12:55 -0000	1.7.2.3
@@ -15,6 +15,9 @@
 XXX_WRAP_YY		If False, do not try to use the relevent CMake wrapping command.
 XXX_YY_FOUND           	If False, optional YY part of XXX sytem is not available.
 XXX_FOUND              	Set to false, or undefined, if we haven't found, or don't want to use XXX.
+XXX_RUNTIME_LIBRARY_DIRS Optionally, the runtime library search path for use when running an executable linked to shared libraries.
+                         The list should be used by user code to create the PATH on windows or LD_LIBRARY_PATH on unix.
+                         This should not be a cache entry.
 
 You do not have to provide all of the above variables. You should provide XXX_FOUND under most circumstances. If XXX is a library, then  XXX_LIBRARIES, should also be defined, and XXX_INCLUDE_DIRS should usually be defined (I guess libm.a might be an exception)