diff options
| author | Allen Byrne <byrn@hdfgroup.org> | 2017-02-17 21:01:39 (GMT) |
|---|---|---|
| committer | Allen Byrne <byrn@hdfgroup.org> | 2017-02-17 21:01:39 (GMT) |
| commit | adfe442b6befa6a31276aba69e9fba835384156c (patch) | |
| tree | 8ab7f771dd5b60dd5c87de6659d18204f1635223 | |
| parent | c4a208819db987cdc93d58a38b724092388c2244 (diff) | |
| parent | c37ecd5bba292e2b594547e0eeb6a385d20194b0 (diff) | |
| download | hdf5-adfe442b6befa6a31276aba69e9fba835384156c.zip hdf5-adfe442b6befa6a31276aba69e9fba835384156c.tar.gz hdf5-adfe442b6befa6a31276aba69e9fba835384156c.tar.bz2 | |
Merge pull request #301 in HDFFV/hdf5 from ~BYRN/hdf5_adb:develop to develop
* commit 'c37ecd5bba292e2b594547e0eeb6a385d20194b0':
Add MPI_Fortran variables
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | fortran/testpar/CMakeLists.txt | 4 |
2 files changed, 11 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f4b5e09..9016f29 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -877,6 +877,15 @@ if (EXISTS "${HDF5_SOURCE_DIR}/fortran" AND IS_DIRECTORY "${HDF5_SOURCE_DIR}/for endif () endif () + # Parallel IO usage requires MPI to be Linked and Included + if (H5_HAVE_PARALLEL) + set (LINK_Fortran_LIBS ${LINK_LIBS} ${MPI_Fortran_LIBRARIES}) + set (LINK_Fortran_SHARED_LIBS ${LINK_SHARED_LIBS} ${MPI_Fortran_LIBRARIES}) + if (MPI_Fortran_LINK_FLAGS) + set (CMAKE_Fortran_EXE_LINKER_FLAGS "${MPI_Fortran_LINK_FLAGS} ${CMAKE_EXE_LINKER_FLAGS}") + endif () + endif () + # ----------------------------------------------------------------------- # wrapper script variables # diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt index ae88ebc..2e4ebc8 100644 --- a/fortran/testpar/CMakeLists.txt +++ b/fortran/testpar/CMakeLists.txt @@ -4,7 +4,7 @@ PROJECT (HDF5_FORTRAN_TESTPAR C CXX Fortran) #----------------------------------------------------------------------------- # Setup include Directories #----------------------------------------------------------------------------- -INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src) +INCLUDE_DIRECTORIES (${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src ${MPI_Fortran_INCLUDE_PATH}) #----------------------------------------------------------------------------- # Add Tests @@ -22,7 +22,7 @@ target_link_libraries (parallel_test ${HDF5_F90_TEST_LIB_TARGET} ${HDF5_F90_LIB_TARGET} ${HDF5_LIB_TARGET} - ${MPI_Fortran_LIBRARIES} + ${LINK_Fortran_LIBS} ) if (WIN32 AND MSVC) target_link_libraries (parallel_test "ws2_32.lib") |