diff options
| author | Brad King <brad.king@kitware.com> | 2015-08-03 13:11:32 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2015-08-03 13:11:32 (GMT) |
| commit | 6508cc5355d74a148e9a8d7feca99d60b9748168 (patch) | |
| tree | 107b131406d20d45d22094b5d93d0b57793937b9 /Modules | |
| parent | 25ec835571741d5339fb653e06e79896d72f8e8a (diff) | |
| parent | 1c46b6aed0db88c97189713f291164f98df780a9 (diff) | |
| download | CMake-6508cc5355d74a148e9a8d7feca99d60b9748168.zip CMake-6508cc5355d74a148e9a8d7feca99d60b9748168.tar.gz CMake-6508cc5355d74a148e9a8d7feca99d60b9748168.tar.bz2 | |
Merge topic 'FindMPI-drop-GetPrerequisites'
1c46b6ae FindMPI: Drop unnecessary and incorrect use of GetPrerequisites
Diffstat (limited to 'Modules')
| -rw-r--r-- | Modules/FindMPI.cmake | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index 06ecfaa..48adf3c 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -102,7 +102,6 @@ # include this to handle the QUIETLY and REQUIRED arguments 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 @@ -578,14 +577,13 @@ foreach (lang C CXX Fortran) 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 (MPI_${lang}_COMPILER) - is_file_executable(MPI_${lang}_COMPILER MPI_COMPILER_IS_EXECUTABLE) - if (NOT MPI_COMPILER_IS_EXECUTABLE) + if (NOT IS_ABSOLUTE "${MPI_${lang}_COMPILER}") # 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 "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() + # If the user specifies a compiler, we don't want to try to search libraries either. + set(try_libs FALSE) else() set(try_libs TRUE) endif() |