From 8f7b0291d8e75d51b5f6dc336710660c454aa6b3 Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Mon, 30 Apr 2007 17:03:53 -0400
Subject: [PATCH] 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
---
 Modules/FindMPI.cmake | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake
index cf39cf677..5e91664cd 100644
--- a/Modules/FindMPI.cmake
+++ b/Modules/FindMPI.cmake
@@ -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_PATH(MPI_INCLUDE_PATH mpi.h
 
 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_LIBRARY
 
 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.")