[cmake-commits] alex committed FindMPI.cmake 1.11 1.12

[cmake-commits at cmake.org]

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

Modified Files:
	FindMPI.cmake 
Log Message:

STYLE: use the newer FIND_XXX syntax, which should find MPI in even more
directories and doesn't require to list standard directories like /usr/lib,
etc.

Alex


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- FindMPI.cmake	3 Nov 2006 00:58:14 -0000	1.11
+++ FindMPI.cmake	30 Apr 2007 21:03:53 -0000	1.12
@@ -4,11 +4,9 @@
 #  MPI_INCLUDE_PATH = where mpi.h can be found
 #  MPI_LIBRARY    = the library to link in (mpi mpich etc)
 
-FIND_PATH(MPI_INCLUDE_PATH mpi.h 
-          /usr/local/include 
-          /usr/include 
-          /usr/include/mpi
-          /usr/local/mpi/include
+FIND_PATH(MPI_INCLUDE_PATH NAMES mpi.h 
+          PATH_SUFFIXES mpi mpi/include
+          PATHS
           "$ENV{ProgramFiles}/MPICH/SDK/Include"
           "$ENV{ProgramFiles}/MPICH2/include"
           "C:/Program Files/MPICH/SDK/Include" 
@@ -16,7 +14,8 @@
 
 FIND_LIBRARY(MPI_LIBRARY 
              NAMES mpich2 mpi mpich 
-             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib
+             PATH_SUFFIXES mpi/lib
+             PATHS
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
              "$ENV{ProgramFiles}/MPICH2/Lib"
              "C:/Program Files/MPICH/SDK/Lib" 
@@ -24,7 +23,8 @@
 
 FIND_LIBRARY(MPI_EXTRA_LIBRARY 
              NAMES mpi++
-             PATHS /usr/lib /usr/local/lib /usr/local/mpi/lib 
+             PATH_SUFFIXES mpi/lib
+             PATHS
              "$ENV{ProgramFiles}/MPICH/SDK/Lib"
              "C:/Program Files/MPICH/SDK/Lib" 
              DOC "If a second mpi library is necessary, specify it here.")