Merge branch 'enable-xdmfdiff-tests' into 'master'

[cmake] Fixed xdmfdiff-tests not appearing See merge request ogs/ogs!5115
ufz · Sep 26, 2024 · 4aa2fc4 · 4aa2fc4
2 parents c47f7b3 + f3ccbf6
commit 4aa2fc4
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 3 deletions.
diff --git 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()

diff --git 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()