mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-02-18 05:01:50 -06:00
Code Issues Packages Projects Releases Wiki Activity

Merge topic 'FindMPI-fix-return'

Browse Source 
8217a26d29 FindMPI: Fix regression when compiling with MPI wrappers

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4254
This commit is contained in:
Brad King
2020-01-22 14:30:46 +00:00
committed by Kitware Robot
parent 3f601ebb0a 8217a26d29
commit fbd20759be
1 changed files with 3 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Modules/FindMPI.cmake
View File

@@ -1060,9 +1060,6 @@ macro(_MPI_assemble_libraries LANG)
endmacro()
macro(_MPI_split_include_dirs LANG)
if("${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
return()
endif()
# Backwards compatibility: Search INCLUDE_PATH if given.
if(MPI_${LANG}_INCLUDE_PATH)
list(APPEND MPI_${LANG}_ADDITIONAL_INCLUDE_DIRS "${MPI_${LANG}_INCLUDE_PATH}")
@@ -1475,7 +1472,9 @@ foreach(LANG IN ITEMS C CXX Fortran)
endif()
endif()
_MPI_split_include_dirs(${LANG})
if(NOT "${MPI_${LANG}_COMPILER}" STREQUAL "${CMAKE_${LANG}_COMPILER}")
_MPI_split_include_dirs(${LANG})
endif()
_MPI_assemble_libraries(${LANG})
_MPI_adjust_compile_definitions(${LANG})