diff options
| author | Robert Schumacher <roschuma@microsoft.com> | 2018-01-23 02:50:01 -0800 |
|---|---|---|
| committer | Robert Schumacher <roschuma@microsoft.com> | 2018-01-23 02:50:01 -0800 |
| commit | 18f44c353d369b4da54cd7d352b9fba0fb911457 (patch) | |
| tree | 9beb67257ac74915d5e70df11f8b46b27acbc30c | |
| parent | 78d3302940f6c11a220008215b6f67daa8cc8bb7 (diff) | |
| download | vcpkg-18f44c353d369b4da54cd7d352b9fba0fb911457.tar.gz vcpkg-18f44c353d369b4da54cd7d352b9fba0fb911457.zip | |
[msmpi] Accept v8.1.1
| -rw-r--r-- | ports/msmpi/portfile.cmake | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 893e6f124..0992f5f5d 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -20,7 +20,7 @@ endmacro() # We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) vcpkg_get_program_files_platform_bitness(PROGRAM_FILES_PLATFORM_BITNESS) set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_PLATFORM_BITNESS}/Microsoft MPI/Bin/mpiexec.exe") -set(MSMPI_EXPECTED_FULL_VERSION "8.1.12438.1084") +set(MSMPI_EXPECTED_FULL_VERSION "8.1.12438") if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") @@ -31,7 +31,8 @@ if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") ) file(READ ${CURRENT_BUILDTREES_DIR}/${MPIEXEC_VERSION_LOGNAME}-out.log MPIEXEC_OUTPUT) - if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)\\]") + # Note: v8.1.1 was released with version 8.1.12438.1091. This is compatible with 8.1.12438.1084 (the version above), so ignore the fourth version number. + if(MPIEXEC_OUTPUT MATCHES "\\[Version ([0-9]+\\.[0-9]+\\.[0-9]+)\\.[0-9]+\\]") if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_EXPECTED_FULL_VERSION) download_msmpi_redistributable_package() |