From a1683532c974892b68b7f19e3b36e50a7d9f89e6 Mon Sep 17 00:00:00 2001
From: Lars Bilke <lars.bilke@ufz.de>
Date: Mon, 17 May 2021 14:25:51 +0200
Subject: [PATCH] [cpm] Bump LibXml2 to 2.9.12 and build statically.
Will fix container runtime.
---
scripts/cmake/Dependencies.cmake | 5 +++--
web/data/versions.json | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/scripts/cmake/Dependencies.cmake b/scripts/cmake/Dependencies.cmake
index 73c7c49e53f..e290aa6933e 100644
--- a/scripts/cmake/Dependencies.cmake
+++ b/scripts/cmake/Dependencies.cmake
@@ -129,8 +129,8 @@ CPMFindPackage(
NAME LibXml2
GITHUB_REPOSITORY GNOME/libxml2
VERSION ${ogs.minimum_version.libxml2}
- GIT_TAG f93ca3e140a371b26366f747a408588c631e0fd1
- OPTIONS "LIBXML2_WITH_TESTS OFF"
+ OPTIONS "BUILD_SHARED_LIBS OFF"
+ "LIBXML2_WITH_TESTS OFF"
"LIBXML2_WITH_PROGRAMS OFF"
"LIBXML2_WITH_ICONV OFF"
"LIBXML2_WITH_ICU OFF"
@@ -142,6 +142,7 @@ CPMFindPackage(
if(LibXml2_ADDED)
add_library(LibXml2::LibXml2 ALIAS LibXml2)
set(LIBXML2_INCLUDE_DIR ${LibXml2_SOURCE_DIR})
+ list(APPEND DISABLE_WARNINGS_TARGETS LibXml2)
endif()
CPMAddPackage(
diff --git a/web/data/versions.json b/web/data/versions.json
index ba7c184a271..303e1de9f3e 100644
--- a/web/data/versions.json
+++ b/web/data/versions.json
@@ -21,7 +21,7 @@
"python": "3.6",
"snakemake": "5.27.4",
"hdf5": "1.10.5",
- "libxml2": "2.9.10"
+ "libxml2": "2.9.12"
},
"tested_version": {
"ubuntu": "20.04",
--
GitLab