From 8aa82bb8957cb5b76ad1d1209cf675b2eba7401d Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Tue, 14 Feb 2017 13:03:51 -0800 Subject: [PATCH] [msmpi] Find the correct Program Files. Resolves #669 --- ports/msmpi/portfile.cmake | 12 ++++++++++-- 1 file 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})