summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAllen Byrne <byrn@hdfgroup.org>2017-02-24 21:50:51 (GMT)
committerAllen Byrne <byrn@hdfgroup.org>2017-02-24 21:50:51 (GMT)
commit6cd6daf8f9093040e8b321c2b00252a16b39c6bb (patch)
tree391781f626486fe2454429b81671e915771f524a
parent1b8c195eb7b277c6b39061b6acac2583a7ee100a (diff)
downloadhdf5-6cd6daf8f9093040e8b321c2b00252a16b39c6bb.zip
hdf5-6cd6daf8f9093040e8b321c2b00252a16b39c6bb.tar.gz
hdf5-6cd6daf8f9093040e8b321c2b00252a16b39c6bb.tar.bz2
mpich module file is in env var
-rw-r--r--config/cmake_ext_mod/FindMPI.cmake3
-rw-r--r--fortran/testpar/CMakeLists.txt2
2 files changed, 4 insertions, 1 deletions
diff --git a/config/cmake_ext_mod/FindMPI.cmake b/config/cmake_ext_mod/FindMPI.cmake
index f562a64..1fb07d4 100644
--- a/config/cmake_ext_mod/FindMPI.cmake
+++ b/config/cmake_ext_mod/FindMPI.cmake
@@ -630,6 +630,9 @@ foreach (lang C CXX Fortran)
try_regular_compiler(${lang} regular_compiler_worked)
endif()
+ # add fortran mpi module path if ENV VAR exists
+ set (MPI_${lang}_INCLUDE_PATH "${MPI_${lang}_INCLUDE_PATH};$ENV{MPI_FORTRAN_MOD_DIR}")
+
set(MPI_${lang}_FIND_QUIETLY ${MPI_FIND_QUIETLY})
set(MPI_${lang}_FIND_REQUIRED ${MPI_FIND_REQUIRED})
set(MPI_${lang}_FIND_VERSION ${MPI_FIND_VERSION})
diff --git a/fortran/testpar/CMakeLists.txt b/fortran/testpar/CMakeLists.txt
index 2e4ebc8..909cbaf 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 ${MPI_Fortran_INCLUDE_PATH})
+INCLUDE_DIRECTORIES (${MPI_Fortran_INCLUDE_PATH} ${HDF5_F90_BINARY_DIR} ${HDF5_F90_SRC_DIR}/src)
#-----------------------------------------------------------------------------
# Add Tests