From 5e5472d20473cb49cae2dd263379cee6e4a370e1 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Tue, 24 Sep 2024 11:03:31 +0200 Subject: [PATCH 1/2] [cmake] Fixed xdmfdiff-tests not appearing. AddTest() checks for xdmfdiff-target which was added later (after tests have been processed). Now xdmfdiff-target is created before ProcessLib & co. --- CMakeLists.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 77be929a127..80d05d50a73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -206,13 +206,13 @@ if(_build_chemistry_lib) endif() if(OGS_BUILD_CLI OR OGS_BUILD_UTILS OR OGS_BUILD_TESTING) + if(TARGET OgsXdmf AND OGS_BUILD_TESTING) + add_subdirectory(Tests/xdmfdiff) + endif() add_subdirectory(ParameterLib) add_subdirectory(MaterialLib) add_subdirectory(ProcessLib) endif() -if(TARGET OgsXdmf) - add_subdirectory(Tests/xdmfdiff) -endif() if(OGS_BUILD_TESTING AND PROJECT_IS_TOP_LEVEL) add_subdirectory(Tests) endif() From f3ccbf60aac7c0eb6fe910d1e6f76bd939cdd9d1 Mon Sep 17 00:00:00 2001 From: Lars Bilke Date: Thu, 26 Sep 2024 11:38:34 +0200 Subject: [PATCH 2/2] [cmake] Fixed zlib-support in hdf5 local build. --- scripts/cmake/DependenciesExternalProject.cmake | 1 + 1 file changed, 1 insertion(+) diff --git a/scripts/cmake/DependenciesExternalProject.cmake b/scripts/cmake/DependenciesExternalProject.cmake index 1798d1ab485..0092a2c9ae8 100644 --- a/scripts/cmake/DependenciesExternalProject.cmake +++ b/scripts/cmake/DependenciesExternalProject.cmake @@ -276,6 +276,7 @@ if(NOT ZLIB_FOUND) set(ZLIB_LIBRARIES ${build_dir_ZLIB}/${CMAKE_INSTALL_LIBDIR}/zlibstatic${_zlib_debug_postfix}${CMAKE_STATIC_LIBRARY_SUFFIX} ) + set(ZLIB_INCLUDE_DIRS ${build_dir_ZLIB}) endif() set(_EXT_LIBS ${_EXT_LIBS} ZLIB CACHE INTERNAL "") endif()