[Cmake-commits] [cmake-commits] partyd committed FindMPI.cmake 1.28 1.29

[cmake-commits at cmake.org]

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

Modified Files:
	FindMPI.cmake 
Log Message:
BUG: rename MPI_PACKAGE_DIR and MPI_PREFIX_PATH vars to be prefixed with _ to prevent conflicts with known variable names in other projects.


Index: FindMPI.cmake
===================================================================
RCS file: /cvsroot/CMake/CMake/Modules/FindMPI.cmake,v
retrieving revision 1.28
retrieving revision 1.29
diff -C 2 -d -r1.28 -r1.29
*** FindMPI.cmake	13 Nov 2009 15:52:28 -0000	1.28
--- FindMPI.cmake	13 Nov 2009 15:57:01 -0000	1.29
***************
*** 73,77 ****
  # Argonne National Labs MPICH2 sets a registry key that we can use.
  
! set(MPI_PACKAGE_DIR
    mpi
    mpich
--- 73,77 ----
  # Argonne National Labs MPICH2 sets a registry key that we can use.
  
! set(_MPI_PACKAGE_DIR
    mpi
    mpich
***************
*** 84,96 ****
    )
  
! set(MPI_PREFIX_PATH)
  if(WIN32)
!   list(APPEND MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
  endif()
  
  foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
!   foreach(MpiPackageDir ${MPI_PREFIX_PATH})
      if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
!       list(APPEND MPI_PREFIX_PATH "${SystemPrefixDir}/${MpiPackageDir}")
      endif()
    endforeach(MpiPackageDir)
--- 84,96 ----
    )
  
! set(_MPI_PREFIX_PATH)
  if(WIN32)
!   list(APPEND _MPI_PREFIX_PATH "[HKEY_LOCAL_MACHINE\\SOFTWARE\\MPICH\\SMPD;binary]/..")
  endif()
  
  foreach(SystemPrefixDir ${CMAKE_SYSTEM_PREFIX_PATH})
!   foreach(MpiPackageDir ${_MPI_PREFIX_PATH})
      if(EXISTS ${SystemPrefixDir}/${MpiPackageDir})
!       list(APPEND _MPI_PREFIX_PATH "${SystemPrefixDir}/${MpiPackageDir}")
      endif()
    endforeach(MpiPackageDir)
***************
*** 100,104 ****
  find_program(MPIEXEC
    NAMES mpiexec mpirun lamexec
!   PATHS ${MPI_PREFIX_PATH}
    PATH_SUFFIXES bin
    DOC "Executable for running MPI programs."
--- 100,104 ----
  find_program(MPIEXEC
    NAMES mpiexec mpirun lamexec
!   PATHS ${_MPI_PREFIX_PATH}
    PATH_SUFFIXES bin
    DOC "Executable for running MPI programs."
***************
*** 223,227 ****
      # paths.
      find_path(MPI_INCLUDE_PATH mpi.h
!   HINTS ${_MPI_BASE_DIR} ${MPI_PREFIX_PATH}
    PATH_SUFFIXES include
      )
--- 223,227 ----
      # paths.
      find_path(MPI_INCLUDE_PATH mpi.h
!   HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
    PATH_SUFFIXES include
      )
***************
*** 305,309 ****
  # No MPI compiler to interogate so attempt to find everything with find functions.
    find_path(MPI_INCLUDE_PATH mpi.h
!     HINTS ${_MPI_BASE_DIR} ${MPI_PREFIX_PATH}
      PATH_SUFFIXES include
      )
--- 305,309 ----
  # No MPI compiler to interogate so attempt to find everything with find functions.
    find_path(MPI_INCLUDE_PATH mpi.h
!     HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
      PATH_SUFFIXES include
      )
***************
*** 318,322 ****
    find_library(MPI_LIBRARY
      NAMES mpi mpich msmpi
!     HINTS ${_MPI_BASE_DIR} ${MPI_PREFIX_PATH}
      PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
      )
--- 318,322 ----
    find_library(MPI_LIBRARY
      NAMES mpi mpich msmpi
!     HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
      PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR}
      )
***************
*** 324,328 ****
    find_library(MPI_EXTRA_LIBRARY
      NAMES mpi++
!     HINTS ${_MPI_BASE_DIR} ${MPI_PREFIX_PATH}
      PATH_SUFFIXES lib
      DOC "Extra MPI libraries to link against.")
--- 324,328 ----
    find_library(MPI_EXTRA_LIBRARY
      NAMES mpi++
!     HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
      PATH_SUFFIXES lib
      DOC "Extra MPI libraries to link against.")
***************
*** 359,363 ****
  
  # unset to cleanup namespace
! unset(MPI_PACKAGE_DIR)
! unset(MPI_PREFIX_PATH)
  unset(_MPI_BASE_DIR)
--- 359,363 ----
  
  # unset to cleanup namespace
! unset(_MPI_PACKAGE_DIR)
! unset(_MPI_PREFIX_PATH)
  unset(_MPI_BASE_DIR)