From cc0aa7b5badad2e123e9eff7cd0f789c707757b0 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Wed, 19 Jan 2022 12:01:56 +0100
Subject: [PATCH] [cmake] Check header, fix hdf5 includes.
---
MeshLib/CMakeLists.txt | 4 +++-
ThirdParty/container-maker | 2 +-
scripts/cmake/Dependencies.cmake | 12 ++++++------
3 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/MeshLib/CMakeLists.txt b/MeshLib/CMakeLists.txt
index 7e6d372f7ae..905236e8e07 100644
--- a/MeshLib/CMakeLists.txt
+++ b/MeshLib/CMakeLists.txt
@@ -43,7 +43,9 @@ target_link_libraries(
$<$<TARGET_EXISTS:petsc>:petsc>
)
-target_include_directories(MeshLib PUBLIC ${VTK_INCLUDE_DIRS})
+target_include_directories(
+ MeshLib PUBLIC ${VTK_INCLUDE_DIRS} ${HDF5_INCLUDE_DIRS}
+)
target_compile_definitions(
MeshLib
diff --git a/ThirdParty/container-maker b/ThirdParty/container-maker
index 297085c8f78..3398e78feaf 160000
--- a/ThirdParty/container-maker
+++ b/ThirdParty/container-maker
@@ -1 +1 @@
-Subproject commit 297085c8f782154bab0c10249f47560cbfab9941
+Subproject commit 3398e78feafb6890e5c27c3e6ce5d36ce1b922b0
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 98a5dbf6106..f3e5082cb77 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -122,7 +122,8 @@ CPMFindPackage(
if(Eigen3_ADDED)
add_library(Eigen3::Eigen INTERFACE IMPORTED)
target_include_directories(
- Eigen3::Eigen SYSTEM INTERFACE ${Eigen3_SOURCE_DIR} ${OpenMP_CXX_INCLUDE_DIRS}
+ Eigen3::Eigen SYSTEM INTERFACE ${Eigen3_SOURCE_DIR}
+ ${OpenMP_CXX_INCLUDE_DIRS}
)
endif()
@@ -220,11 +221,10 @@ else()
if(ZLIB_ADDED)
list(APPEND HDF5_LIBRARIES zlibstatic)
endif()
- set(HDF5_C_INCLUDE_DIR ${HDF5_SOURCE_DIR}/src)
- set(HDF5_INCLUDE_DIR ${HDF5_SOURCE_DIR}/src)
- target_include_directories(
- hdf5-static INTERFACE ${HDF5_BINARY_DIR} ${HDF5_INCLUDE_DIR}
- )
+ set(HDF5_INCLUDE_DIRS ${HDF5_SOURCE_DIR}/src ${HDF5_BINARY_DIR})
+ set(HDF5_C_INCLUDE_DIRS ${HDF5_INCLUDE_DIRS})
+ set(HDF5_C_INCLUDE_DIR ${HDF5_INCLUDE_DIRS})
+ target_include_directories(hdf5-static INTERFACE ${HDF5_INCLUDE_DIRS})
else()
find_package(HDF5 REQUIRED)
endif()
--
GitLab