diff options
| author | Todd Gamblin <tgamblin@llnl.gov> | 2011-06-21 21:02:01 (GMT) |
|---|---|---|
| committer | Todd Gamblin <tgamblin@llnl.gov> | 2011-06-21 21:02:01 (GMT) |
| commit | 8756e77fb40eabe1441889f4e82cb2997833bc82 (patch) | |
| tree | fc7c01c9138dd7ed8d821ea1b5d300524961c908 /Modules/FindMPI.cmake | |
| parent | e00d2c4d51da6d9c641af7e4537bfa97e22ce1fc (diff) | |
| download | CMake-8756e77fb40eabe1441889f4e82cb2997833bc82.zip CMake-8756e77fb40eabe1441889f4e82cb2997833bc82.tar.gz CMake-8756e77fb40eabe1441889f4e82cb2997833bc82.tar.bz2 | |
Fix issues with removing try_compile input file.
- Don't remove input file
- Put output in ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}
- Remove try_compile variable from the cache after using
Diffstat (limited to 'Modules/FindMPI.cmake')
| -rw-r--r-- | Modules/FindMPI.cmake | 20 |
1 files changed, 12 insertions, 8 deletions
diff --git a/Modules/FindMPI.cmake b/Modules/FindMPI.cmake index d251088..250d8a6 100644 --- a/Modules/FindMPI.cmake +++ b/Modules/FindMPI.cmake @@ -443,10 +443,14 @@ function (interrogate_mpi_compiler lang try_libs) endfunction() +# This function attempts to compile with the regular compiler, to see if MPI programs +# work with it. This is a last ditch attempt after we've tried interrogating mpicc and +# friends, and after we've tried to find generic libraries. Works on machines like +# Cray XE6, where the modules environment changes what MPI version cc, CC, and ftn use. function(try_regular_compiler lang success) - # last ditch attempt: just try to compile something with the regular compiler + set(scratch_directory ${CMAKE_CURRENT_BINARY_DIR}${CMAKE_FILES_DIRECTORY}) if (${lang} STREQUAL Fortran) - set(test_file ${CMAKE_CURRENT_BINARY_DIR}/cmake_mpi_test.f90) + set(test_file ${scratch_directory}/cmake_mpi_test.f90) file(WRITE ${test_file} "program hello\n" "include 'mpif.h'\n" @@ -456,9 +460,9 @@ function(try_regular_compiler lang success) "end\n") else() if (${lang} STREQUAL CXX) - set(test_file ${CMAKE_CURRENT_BINARY_DIR}/cmake_mpi_test.cpp) + set(test_file ${scratch_directory}/cmake_mpi_test.cpp) else() - set(test_file ${CMAKE_CURRENT_BINARY_DIR}/cmake_mpi_test.c) + set(test_file ${scratch_directory}/cmake_mpi_test.c) endif() file(WRITE ${test_file} "#include <mpi.h>\n" @@ -467,8 +471,8 @@ function(try_regular_compiler lang success) " MPI_Finalize();\n" "}\n") endif() - try_compile(worked ${CMAKE_CURRENT_BINARY_DIR} ${test_file}) - if (worked) + try_compile(compiler_has_mpi ${scratch_directory} ${test_file}) + if (compiler_has_mpi) set(MPI_${lang}_NO_INTERROGATE ${CMAKE_${lang}_COMPILER} CACHE STRING "Whether to interrogate MPI ${lang} compiler" FORCE) set(MPI_${lang}_COMPILER ${CMAKE_${lang}_COMPILER} CACHE STRING "MPI ${lang} compiler" FORCE) set(MPI_${lang}_COMPILE_FLAGS "" CACHE STRING "MPI ${lang} compilation flags" FORCE) @@ -476,8 +480,8 @@ function(try_regular_compiler lang success) set(MPI_${lang}_LINK_FLAGS "" CACHE STRING "MPI ${lang} linking flags" FORCE) set(MPI_${lang}_LIBRARIES "" CACHE STRING "MPI ${lang} libraries to link against" FORCE) endif() - set(${success} ${worked} PARENT_SCOPE) - file(REMOVE ${test_file}) + set(${success} ${compiler_has_mpi} PARENT_SCOPE) + unset(compiler_has_mpi CACHE) endfunction() # End definitions, commence real work here. |