diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2018-08-02 16:48:02 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2018-08-02 16:48:02 (GMT) |
| commit | 51d31c5ff89f4cf9f1d29d994e5ab6594c3dbd1d (patch) | |
| tree | b70c20e5a79b95365a1d4e31f0ee0164acd51a32 | |
| parent | 70de0b18e33656d46be7da1d6bcf0f53605b673c (diff) | |
| parent | b4571f619018f428569cbae5d025935ac5f1788e (diff) | |
| download | hdf5-51d31c5ff89f4cf9f1d29d994e5ab6594c3dbd1d.zip hdf5-51d31c5ff89f4cf9f1d29d994e5ab6594c3dbd1d.tar.gz hdf5-51d31c5ff89f4cf9f1d29d994e5ab6594c3dbd1d.tar.bz2 | |
Merge pull request #1173 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'b4571f619018f428569cbae5d025935ac5f1788e':
Typo fix
Set CMAKE_REQUIRED_INCLUDES instead of using path in call
| -rw-r--r-- | CMakeLists.txt | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index cd69fb2..eb860d2 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -555,15 +555,16 @@ if (HDF5_ENABLE_PARALLEL) set (H5_HAVE_PARALLEL 1) # MPI checks, only do these if MPI_C_FOUND is true, otherwise they always fail # and once set, they are cached as false and not regenerated - set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}" ) + set (CMAKE_REQUIRED_LIBRARIES "${MPI_C_LIBRARIES}") + set (CMAKE_REQUIRED_INCLUDES "${MPI_C_INCLUDE_DIRS}") # Used by Fortran + MPI - CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm) - CHECK_SYMBOL_EXISTS (MPI_Info_c2f "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_MULTI_LANG_Info) + CHECK_SYMBOL_EXISTS (MPI_Comm_c2f "mpi.h" H5_HAVE_MPI_MULTI_LANG_Comm) + CHECK_SYMBOL_EXISTS (MPI_Info_c2f "mpi.h" H5_HAVE_MPI_MULTI_LANG_Info) # Used by Parallel Compression feature set (PARALLEL_FILTERED_WRITES ON) - CHECK_SYMBOL_EXISTS (MPI_Mprobe "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_Mprobe) - CHECK_SYMBOL_EXISTS (MPI_Imrecv "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_Imrecv) + CHECK_SYMBOL_EXISTS (MPI_Mprobe "mpi.h" H5_HAVE_MPI_Mprobe) + CHECK_SYMBOL_EXISTS (MPI_Imrecv "mpi.h" H5_HAVE_MPI_Imrecv) if (NOT H5_HAVE_MPI_Mprobe OR NOT H5_HAVE_MPI_Imrecv) message (WARNING "The MPI_Mprobe and/or MPI_Imrecv functions could not be located. Parallel writes of filtered data will be disabled.") @@ -572,8 +573,8 @@ if (HDF5_ENABLE_PARALLEL) # Used by big I/O feature set (LARGE_PARALLEL_IO ON) - CHECK_SYMBOL_EXISTS (MPI_Get_elements_x "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_Get_elements_x) - CHECK_SYMBOL_EXISTS (MPI_Type_size_x "${MPI_C_INCLUDE_DIRS}/mpi.h" H5_HAVE_MPI_Type_size_x) + CHECK_SYMBOL_EXISTS (MPI_Get_elements_x "mpi.h" H5_HAVE_MPI_Get_elements_x) + CHECK_SYMBOL_EXISTS (MPI_Type_size_x "mpi.h" H5_HAVE_MPI_Type_size_x) if (NOT H5_HAVE_MPI_Get_elements_x OR NOT H5_HAVE_MPI_Type_size_x) message (WARNING "The MPI_Get_elements_x and/or MPI_Type_size_x functions could not be located. Reading/Writing >2GB of data in a single parallel I/O operation will be disabled.") |