FindMPI: MSMPI changed the subdirectories it uses

This commit is contained in:
Ben Boeckel 2015-01-06 12:58:31 -05:00
parent 827243942c
commit ab4d1d07e4
1 changed files with 5 additions and 3 deletions

View File

@ -426,16 +426,18 @@ function (interrogate_mpi_compiler lang try_libs)
# Decide between 32-bit and 64-bit libraries for Microsoft's MPI
if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8)
set(MS_MPI_ARCH_DIR amd64)
set(MS_MPI_ARCH_DIR x64)
set(MS_MPI_ARCH_DIR2 amd64)
else()
set(MS_MPI_ARCH_DIR i386)
set(MS_MPI_ARCH_DIR x86)
set(MS_MPI_ARCH_DIR2 i386)
endif()
set(MPI_LIB "MPI_LIB-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
find_library(MPI_LIB
NAMES mpi mpich mpich2 msmpi
HINTS ${_MPI_BASE_DIR} ${_MPI_PREFIX_PATH}
PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR})
PATH_SUFFIXES lib lib/${MS_MPI_ARCH_DIR} Lib Lib/${MS_MPI_ARCH_DIR} Lib/${MS_MPI_ARCH_DIR2})
set(MPI_LIBRARIES_WORK ${MPI_LIB})
# Right now, we only know about the extra libs for C++.