From ac72aecdcd50acb73fa5832552683d2a7e1f63fd Mon Sep 17 00:00:00 2001
From: Chuck Atkins <chuck.atkins@kitware.com>
Date: Wed, 26 Apr 2017 19:46:45 +0000
Subject: [PATCH] Use the HDF5_C_INCLUDE_DIRS instead of HDF5_INCLUDE_DIRS
---
examples/heatTransfer/write/CMakeLists.txt | 2 +-
source/adios2/CMakeLists.txt | 3 +--
testing/adios2/engine/hdf5/CMakeLists.txt | 6 +++++-
3 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/examples/heatTransfer/write/CMakeLists.txt b/examples/heatTransfer/write/CMakeLists.txt
index 89373e645..763a151aa 100644
--- a/examples/heatTransfer/write/CMakeLists.txt
+++ b/examples/heatTransfer/write/CMakeLists.txt
@@ -46,7 +46,7 @@ if(ADIOS_USE_MPI)
IO_hdf5_a.cpp
)
target_include_directories(heatTransfer_write_hdf5
- PRIVATE ${MPI_C_INCLUDE_PATH} ${HDF5_INCLUDE_DIRS}
+ PRIVATE ${MPI_C_INCLUDE_PATH} ${HDF5_C_INCLUDE_DIRS}
)
target_link_libraries(heatTransfer_write_hdf5
${MPI_C_LIBRARIES} ${HDF5_C_LIBRARIES}
diff --git a/source/adios2/CMakeLists.txt b/source/adios2/CMakeLists.txt
index 75d221e4b..7099e25b2 100644
--- a/source/adios2/CMakeLists.txt
+++ b/source/adios2/CMakeLists.txt
@@ -102,8 +102,7 @@ if(ADIOS_USE_HDF5)
"of ADIOS is being built, which requires a sequential HDF5."
)
endif()
-
- target_include_directories(adios2 PRIVATE ${HDF5_INCLUDE_DIRS})
+ target_include_directories(adios2 PRIVATE ${HDF5_C_INCLUDE_DIRS})
target_sources(adios2 PRIVATE
engine/hdf5/HDF5ReaderP.cpp
engine/hdf5/HDF5WriterP.cpp
diff --git a/testing/adios2/engine/hdf5/CMakeLists.txt b/testing/adios2/engine/hdf5/CMakeLists.txt
index b8a4a56c2..2f69ed7a3 100644
--- a/testing/adios2/engine/hdf5/CMakeLists.txt
+++ b/testing/adios2/engine/hdf5/CMakeLists.txt
@@ -3,6 +3,10 @@
# accompanying file Copyright.txt for details.
#------------------------------------------------------------------------------#
+find_package(HDF5 REQUIRED)
+
add_executable(TestHDF5WriteRead TestHDF5WriteRead.cpp)
-target_link_libraries(TestHDF5WriteRead adios2 gtest)
+target_include_directories(TestHDF5WriteRead PRIVATE ${HDF5_C_INCLUDE_DIRS})
+target_link_libraries(TestHDF5WriteRead adios2 gtest ${HDF5_C_LIBRARIES})
+
add_test(NAME adios2::engine::hdf5::write_read COMMAND TestHDF5WriteRead)
--
GitLab