OilfieldToolsNet/IFEM
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed: hdf5 serial/parallel switch support

Browse Source 
requires a ubuntu 16.04 or equivalent modern distro.

this for a newer cmake, and for the ability to have the serial
and parallel hdf5 libraries coexist on the system.
This commit is contained in:
Arne Morten Kvarving
2016-06-30 15:24:14 +02:00
parent cdc21471d0
commit 0f64a9438d
1 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
cmake/Modules/FindIFEMDeps.cmake
View File

@@ -76,17 +76,6 @@ SET(IFEM_DEPINCLUDES ${IFEM_DEPINCLUDES}
SET(IFEM_CXX_FLAGS "${IFEM_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CXX_STD11_FLAGS}")
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} ${CMAKE_CXX_FLAGS} ${CXX_STD11_FLAGS}")
# HDF5
IF(IFEM_USE_HDF5)
FIND_PACKAGE(HDF5)
IF(HDF5_LIBRARIES AND HDF5_INCLUDE_DIR)
SET(IFEM_DEPLIBS ${IFEM_DEPLIBS} ${HDF5_LIBRARIES})
SET(IFEM_DEPINCLUDES ${IFEM_DEPINCLUDES} ${HDF5_INCLUDE_DIR})
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DHAS_HDF5=1")
list(APPEND IFEM_DEFINITIONS -DHAS_HDF5=1)
ENDIF(HDF5_LIBRARIES AND HDF5_INCLUDE_DIR)
ENDIF(IFEM_USE_HDF5)
# TinyXML
FIND_PACKAGE(TinyXML)
IF(TINYXML_INCLUDE_DIR AND TINYXML_LIBRARIES)
@@ -163,6 +152,21 @@ IF(IFEM_USE_PETSC)
ENDIF()
ENDIF(IFEM_USE_PETSC)
# HDF5
IF(IFEM_USE_HDF5)
if(IFEM_USE_PARALLEL_PETSC)
set(HDF5_PREFER_PARALLEL 1)
endif()
FIND_PACKAGE(HDF5)
IF(HDF5_LIBRARIES AND HDF5_INCLUDE_DIR)
SET(IFEM_DEPLIBS ${IFEM_DEPLIBS} ${HDF5_LIBRARIES})
SET(IFEM_DEPINCLUDES ${IFEM_DEPINCLUDES} ${HDF5_INCLUDE_DIR})
SET(IFEM_BUILD_CXX_FLAGS "${IFEM_BUILD_CXX_FLAGS} -DHAS_HDF5=1")
list(APPEND IFEM_DEFINITIONS -DHAS_HDF5=1)
ENDIF(HDF5_LIBRARIES AND HDF5_INCLUDE_DIR)
ENDIF(IFEM_USE_HDF5)
# SPR
IF(IFEM_USE_SPR)
FIND_PACKAGE(SPR)