diff options
| author | Stefano Sinigardi <stesinigardi@hotmail.com> | 2019-01-17 00:50:46 +0100 |
|---|---|---|
| committer | Phil Christensen <philc@microsoft.com> | 2019-01-16 15:50:45 -0800 |
| commit | e8489a46c11775036f82e9f6ecc25d61feecee66 (patch) | |
| tree | f8c0d3530f3eafff2b0c42663c488a8fab8699b2 /ports/msmpi | |
| parent | 13ec61a842588480f49d3c3a6a3b42d70df4fa84 (diff) | |
| download | vcpkg-e8489a46c11775036f82e9f6ecc25d61feecee66.tar.gz vcpkg-e8489a46c11775036f82e9f6ecc25d61feecee66.zip | |
[msmpi] update to 10.0 (#5107)
* [msmpi] update to 10.0
* [parmetis] fix build error
Diffstat (limited to 'ports/msmpi')
| -rw-r--r-- | ports/msmpi/CONTROL | 2 | ||||
| -rw-r--r-- | ports/msmpi/portfile.cmake | 26 |
2 files changed, 15 insertions, 13 deletions
diff --git a/ports/msmpi/CONTROL b/ports/msmpi/CONTROL index 27e27074a..7a4b2d62e 100644 --- a/ports/msmpi/CONTROL +++ b/ports/msmpi/CONTROL @@ -1,3 +1,3 @@ Source: msmpi -Version: 9.0 +Version: 10.0 Description: Microsoft MPI diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 7933f2361..70c2ff5d9 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -1,17 +1,19 @@ include(vcpkg_common_functions) -set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-8.1) + +set(MSMPI_VERSION "10.0.12498") +set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/msmpi-${MSMPI_VERSION}) vcpkg_download_distfile(SDK_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisdk.msi" - FILENAME "msmpisdk-9.0.msi" - SHA512 f80cc7619c42a5a0975224c5a0ab6d4085a97ab9a1480318cd72db2f600db52fb81d3959a2a9e0dbd9412b02d0814b8191dd4745bbde397110210e05960628b4 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisdk.msi" + FILENAME "msmpisdk-${MSMPI_VERSION}.msi" + SHA512 36a31b2516f45fbc26167b31d2d6419f1928aef1591033f0430d36570159205e1a3134557a4ac0462f2d879add1fc6fee87a6997032e4438b528cd42a8bbe6b1 ) macro(download_msmpi_redistributable_package) vcpkg_download_distfile(REDIST_ARCHIVE - URLS "https://download.microsoft.com/download/2/E/C/2EC96D7F-687B-4613-80F6-E10F670A2D97/msmpisetup.exe" - FILENAME "msmpisetup-9.0.exe" - SHA512 ad1cc3bc74e4c9c3c0f304395df9468e729e0acd9c77c8c6c806e88eadf4693811d29e608ffb459fcb6f4a20f61946ef4ac2e411aac49fb8f8d5aaddd10d4554 + URLS "https://download.microsoft.com/download/A/E/0/AE002626-9D9D-448D-8197-1EA510E297CE/msmpisetup.exe" + FILENAME "msmpisetup-${MSMPI_VERSION}.exe" + SHA512 c272dc842eb1e693f25eb580e1caf0c1fdb385611a12c20cdc6a40cf592ccbdba434a1c16edb63eef14b1a2ac6e678ac1cd561ec5fd003a5d17191a0fad281ae ) endmacro() @@ -20,7 +22,6 @@ 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 "9.0.12497") if(EXISTS "${SYSTEM_MPIEXEC_FILEPATH}") set(MPIEXEC_VERSION_LOGNAME "mpiexec-version") @@ -32,12 +33,12 @@ 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]+\\]") - if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_EXPECTED_FULL_VERSION) + if(NOT CMAKE_MATCH_1 STREQUAL MSMPI_VERSION) download_msmpi_redistributable_package() message(FATAL_ERROR " The version of the installed MSMPI redistributable packages does not match the version to be installed\n" - " Expected version: ${MSMPI_EXPECTED_FULL_VERSION}\n" + " Expected version: ${MSMPI_VERSION}\n" " Found version: ${CMAKE_MATCH_1}\n" " Please upgrade the installed version on your system.\n" " The appropriate installer for the expected version has been downloaded to:\n" @@ -131,5 +132,6 @@ if(TRIPLET_SYSTEM_ARCH STREQUAL "x86") endif() # Handle copyright -file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/license_sdk.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) -file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying license_sdk.rtf") +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MicrosoftMPI-SDK-EULA.rtf" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(COPY "${SOURCE_PATH}/sdk/PFiles/Microsoft SDKs/MPI/License/MPI-SDK-TPN.txt" DESTINATION ${CURRENT_PACKAGES_DIR}/share/msmpi) +file(WRITE ${CURRENT_PACKAGES_DIR}/share/msmpi/copyright "See the accompanying MicrosoftMPI-SDK-EULA.rtf and MPI-SDK-TPN.txt") |