diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-14 17:29:47 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-14 17:29:47 -0800 |
| commit | da26d097165b5d06b77e7dcb13bf1b8a8c9c079e (patch) | |
| tree | b50fad3836e14a1591276b59e5a2ca31f7496ae3 /ports | |
| parent | a9a63192dd77837fd3cf9fb4d04469a54f793317 (diff) | |
| download | vcpkg-da26d097165b5d06b77e7dcb13bf1b8a8c9c079e.tar.gz vcpkg-da26d097165b5d06b77e7dcb13bf1b8a8c9c079e.zip | |
Add functions to find Program Files folders on the CMake side
Diffstat (limited to 'ports')
| -rw-r--r-- | ports/msmpi/portfile.cmake | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/ports/msmpi/portfile.cmake b/ports/msmpi/portfile.cmake index 4a142f20b..faf012396 100644 --- a/ports/msmpi/portfile.cmake +++ b/ports/msmpi/portfile.cmake @@ -10,13 +10,8 @@ vcpkg_download_distfile(SDK_ARCHIVE ### 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") +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.0.12438.0") if(EXISTS ${SYSTEM_MPIEXEC_FILEPATH}) |