Skip to content
Snippets Groups Projects
Commit 56c9e5e9 authored by Ben Boeckel's avatar Ben Boeckel Committed by Kitware Robot
Browse files

Merge topic 'fix-xdmf-hdf5-parallel'


2f239599 Xdmf2: Fix HDF5 include var used in parallel check

Acked-by: default avatarKitware Robot <kwrobot@kitware.com>
Reviewed-by: default avatarBen Boeckel <ben.boeckel@kitware.com>
Merge-request: !1739
parents f83ed453 2f239599
No related branches found
No related tags found
No related merge requests found
......@@ -30,8 +30,6 @@ if (XDMF_BUILT_INVTK)
set(XDMF_HDF5_INCLUDE_DIRS ${vtkhdf5_INCLUDE_DIRS})
else()
find_package(HDF5 REQUIRED)
set(XDMF_HDF5_LIBRARIES ${HDF5_LIBRARIES})
set(XDMF_HDF5_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
endif()
......@@ -44,7 +42,7 @@ endif()
# we need to do it manually ourselves
if(NOT HDF5_IS_PARALLEL)
include(CheckSymbolExists)
set(CMAKE_REQUIRED_INCLUDES ${HDF5_INCLUDE_DIRS})
set(CMAKE_REQUIRED_INCLUDES ${XDMF_HDF5_INCLUDE_DIRS})
check_symbol_exists(H5_HAVE_PARALLEL hdf5.h HDF5_IS_PARALLEL)
unset(CMAKE_REQUIRED_INCLUDES)
endif()
......@@ -54,7 +52,7 @@ endif()
option(XDMF_BUILD_MPI "XDMF should use MPI" OFF)
mark_as_advanced(XDMF_BUILD_MPI)
if(HDF5_IS_PARALLEL AND NOT XDMF_BUILD_MPI)
message(WARNING "Xdmf2: Enabling MPI since a parallel HDF5 is being used.")
message(STATUS "Xdmf2: Enabling MPI since a parallel HDF5 is being used.")
set(XDMF_BUILD_MPI ON)
endif()
if (XDMF_BUILD_MPI)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment