diff options
| author | Ben Boeckel <ben.boeckel@kitware.com> | 2015-01-06 17:58:31 (GMT) |
|---|---|---|
| committer | Ben Boeckel <ben.boeckel@kitware.com> | 2015-01-06 17:59:07 (GMT) |
| commit | ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d (patch) | |
| tree | 0053757e8cd9d41682b2c0cc57d37e09c1272e01 | |
| parent | 827243942c3568bbb621c4009c8f03fdd0ba71f7 (diff) | |
| download | CMake-ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d.zip CMake-ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d.tar.gz CMake-ab4d1d07e44b42d963aaec8b8b4cdd57c938ea9d.tar.bz2 | |
FindMPI: MSMPI changed the subdirectories it uses
| -rw-r--r-- | Modules/FindMPI.cmake | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 672c65d..9192054 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -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++. |