kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'FindMPI-drop-GetPrerequisites' 

1c46b6ae FindMPI: Drop unnecessary and incorrect use of GetPrerequisites
This commit is contained in:
Brad King 2015-08-03 09:11:32 -04:00 committed by CMake Topic Stage
parent 25ec835571 1c46b6aed0
commit 6508cc5355
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Modules/FindMPI.cmake
View File

@ -102,7 +102,6 @@
# include this to handle the QUIETLY and REQUIRED arguments # include this to handle the QUIETLY and REQUIRED arguments
include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake) include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
include(${CMAKE_CURRENT_LIST_DIR}/GetPrerequisites.cmake)
# #
# This part detects MPI compilers, attempting to wade through the mess of compiler names in # This part detects MPI compilers, attempting to wade through the mess of compiler names in
@ -578,14 +577,13 @@ foreach (lang C CXX Fortran)
if (CMAKE_${lang}_COMPILER_WORKS) if (CMAKE_${lang}_COMPILER_WORKS)
# If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler. # If the user supplies a compiler *name* instead of an absolute path, assume that we need to find THAT compiler.
if (MPI_${lang}_COMPILER) if (MPI_${lang}_COMPILER)
is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE) if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}")
if (NOT MPI_COMPILER_IS_EXECUTABLE)
# Get rid of our default list of names and just search for the name the user wants. # Get rid of our default list of names and just search for the name the user wants.
set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER}) set(_MPI_${lang}_COMPILER_NAMES ${MPI_${lang}_COMPILER})
set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE) set(MPI_${lang}_COMPILER "MPI_${lang}_COMPILER-NOTFOUND" CACHE FILEPATH "Cleared" FORCE)
# If the user specifies a compiler, we don't want to try to search libraries either.
set(try_libs FALSE)
endif() endif()
# If the user specifies a compiler, we don't want to try to search libraries either.
set(try_libs FALSE)
else() else()
set(try_libs TRUE) set(try_libs TRUE)
endif() endif()