reactos/CMake
1
0
Fork 0
mirror of https://github.com/reactos/CMake.git synced 2024-12-13 14:27:23 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge topic 'findmpi-notfound-spam'

Browse Source 
bde7513d FindMPI: Correct legacy variable handling

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1557
This commit is contained in:
Brad King 2017-12-06 13:00:12 +00:00 committed by Kitware Robot
commit 22f440ae69
1 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Modules/FindMPI.cmake
View File

@ -602,6 +602,9 @@ function (_MPI_interrogate_compiler lang)
if(MPI_DIRECT_LIB_NAMES_WORK) if(MPI_DIRECT_LIB_NAMES_WORK)
set(MPI_PLAIN_LIB_NAMES_WORK "${MPI_DIRECT_LIB_NAMES_WORK};${MPI_PLAIN_LIB_NAMES_WORK}") set(MPI_PLAIN_LIB_NAMES_WORK "${MPI_DIRECT_LIB_NAMES_WORK};${MPI_PLAIN_LIB_NAMES_WORK}")
endif() endif()
if(MPI_${LANG}_EXTRA_LIB_NAMES)
list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${MPI_${LANG}_EXTRA_LIB_NAMES}")
endif()
# MPI might require pthread to work. The above mechanism wouldn't detect it, but we need to # MPI might require pthread to work. The above mechanism wouldn't detect it, but we need to
# link it in that case. -lpthread is covered by the normal library treatment on the other hand. # link it in that case. -lpthread is covered by the normal library treatment on the other hand.
@ -1076,18 +1079,21 @@ foreach (LANG IN ITEMS C CXX)
endif() endif()
# If a list of libraries was given, we'll split it into new-style cache variables # If a list of libraries was given, we'll split it into new-style cache variables
unset(MPI_${LANG}_EXTRA_LIB_NAMES)
if(NOT MPI_${LANG}_LIB_NAMES) if(NOT MPI_${LANG}_LIB_NAMES)
foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIBRARIES MPI_LIBRARY MPI_EXTRA_LIBRARY) foreach(_MPI_LIB IN LISTS MPI_${LANG}_LIBRARIES MPI_LIBRARY MPI_EXTRA_LIBRARY)
get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE) if(_MPI_LIB)
get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME) get_filename_component(_MPI_PLAIN_LIB_NAME "${_MPI_LIB}" NAME_WE)
get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY) get_filename_component(_MPI_LIB_NAME "${_MPI_LIB}" NAME)
list(APPEND MPI_PLAIN_LIB_NAMES_WORK "${_MPI_PLAIN_LIB_NAME}") get_filename_component(_MPI_LIB_DIR "${_MPI_LIB}" DIRECTORY)
find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY list(APPEND MPI_${LANG}_EXTRA_LIB_NAMES "${_MPI_PLAIN_LIB_NAME}")
NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}" find_library(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY
HINTS ${_MPI_LIB_DIR} $ENV{MPI_LIB} NAMES "${_MPI_LIB_NAME}" "lib${_MPI_LIB_NAME}"
DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI" HINTS ${_MPI_LIB_DIR} $ENV{MPI_LIB}
) DOC "Location of the ${_MPI_PLAIN_LIB_NAME} library for MPI"
mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY) )
mark_as_advanced(MPI_${_MPI_PLAIN_LIB_NAME}_LIBRARY)
endif()
endforeach() endforeach()
endif() endif()
endforeach() endforeach()