diff options
| author | Brad King <brad.king@kitware.com> | 2020-04-21 12:19:42 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-04-21 12:20:48 (GMT) |
| commit | a0cf159b9bd464122e321c7293f04e31a82a3b7e (patch) | |
| tree | 2d960bce3a9c447b6f0e5dcc3a7f62326a784b88 | |
| parent | d56c96e96752452b7c299ae376e9a76335e1e236 (diff) | |
| parent | faa0c62106591a3eb88316bde2eaf90ab44dc1d4 (diff) | |
| download | CMake-a0cf159b9bd464122e321c7293f04e31a82a3b7e.zip CMake-a0cf159b9bd464122e321c7293f04e31a82a3b7e.tar.gz CMake-a0cf159b9bd464122e321c7293f04e31a82a3b7e.tar.bz2 | |
Merge topic 'FindMPI-msmpi-env'
faa0c62106 FindMPI: Normalize paths from MSMPI environment variables
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4644
| -rw-r--r-- | Modules/FindMPI.cmake | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index cdbb927..e9b6bd2 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -867,11 +867,11 @@ function(_MPI_guess_settings LANG) # We first attempt to locate the msmpi.lib. Should be find it, we'll assume that the MPI present is indeed # Microsoft MPI. if("${CMAKE_SIZEOF_VOID_P}" EQUAL 8) - set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB64}") - set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x64") + file(TO_CMAKE_PATH "$ENV{MSMPI_LIB64}" MPI_MSMPI_LIB_PATH) + file(TO_CMAKE_PATH "$ENV{MSMPI_INC}/x64" MPI_MSMPI_INC_PATH_EXTRA) else() - set(MPI_MSMPI_LIB_PATH "$ENV{MSMPI_LIB32}") - set(MPI_MSMPI_INC_PATH_EXTRA "$ENV{MSMPI_INC}/x86") + file(TO_CMAKE_PATH "$ENV{MSMPI_LIB32}" MPI_MSMPI_LIB_PATH) + file(TO_CMAKE_PATH "$ENV{MSMPI_INC}/x86" MPI_MSMPI_INC_PATH_EXTRA) endif() find_library(MPI_msmpi_LIBRARY |