diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-14 13:03:51 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-14 13:03:51 -0800 |
| commit | 8aa82bb8957cb5b76ad1d1209cf675b2eba7401d (patch) | |
| tree | 61a42a23e4d08563951f6f897ad1684d1032afb5 | |
| parent | 0af2fdf1afe5f48a8f7755b768df1e9f88c866dd (diff) | |
| download | vcpkg-8aa82bb8957cb5b76ad1d1209cf675b2eba7401d.tar.gz vcpkg-8aa82bb8957cb5b76ad1d1209cf675b2eba7401d.zip | |
[msmpi] Find the correct Program Files. Resolves #669
| -rw-r--r-- | ports/msmpi/portfile.cmake | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index b59a2f590..4a142f20b 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -7,8 +7,16 @@ vcpkg_download_distfile(SDK_ARCHIVE SHA512 49c762873ba777ccb3c959a1d2ca1392e4c3c8d366e604ad707184ea432302e6649894ec6599162d0d40f3e6ebc0dada1eb9ca0da1cde0f6ba7a9b1847dac8c0 ) -# Check for correct version of installed redistributable package -set(SYSTEM_MPIEXEC_FILEPATH "$ENV{PROGRAMFILES}/Microsoft MPI/Bin/mpiexec.exe") +### Check for correct version of installed redistributable package + +# We always want the ProgramFiles folder even on a 64-bit machine (not the ProgramFilesx86 folder) +# The following makes sure both 32-bit and 64-bit processes get the correct ProgramFiles +if(DEFINED ENV{ProgramW6432}) + set(PROGRAM_FILES_FOLDER $ENV{ProgramW6432}) +else() + set(PROGRAM_FILES_FOLDER $ENV{PROGRAMFILES}) +endif() +set(SYSTEM_MPIEXEC_FILEPATH "${PROGRAM_FILES_FOLDER}/Microsoft MPI/Bin/mpiexec.exe") set(MSMPI_EXPECTED_FULL_VERSION "8.0.12438.0") if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH}) |