From b404e657ddabd1bcdcecc683367349b1ca83bfbd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Marius=20Miku=C4=8Dionis?= <marius@cs.aau.dk>
Date: Wed, 16 Aug 2023 09:21:48 +0200
Subject: [PATCH] Simplified dependency to LibXml2 and updated the version
 number

---
 CMakeLists.txt      | 2 +-
 cmake/libxml2.cmake | 3 ++-
 getlibs/getlibs.sh  | 6 ++++--
 3 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 215bb28e..c74ca5ba 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
 cmake_minimum_required(VERSION 3.16)
-project(UTAP VERSION 1.1.6 LANGUAGES CXX C)
+project(UTAP VERSION 2.0.1 LANGUAGES CXX C)
 include(CMakePackageConfigHelpers)
 include(GNUInstallDirs)
 
diff --git a/cmake/libxml2.cmake b/cmake/libxml2.cmake
index 2c97f34c..af5b41a2 100644
--- a/cmake/libxml2.cmake
+++ b/cmake/libxml2.cmake
@@ -6,6 +6,7 @@ if(LibXml2_FOUND)
 else(LibXml2_FOUND)
     message(STATUS "Failed to find LibXml2, going to make it from scratch.")
     include(FetchContent)
+    set(LIBXML2_SHARED_LIBS OFF CACHE BOOL "LibXml2 shared libraries")
     set(LIBXML2_WITH_FTP OFF CACHE BOOL "LibXml2 FTP support")
     set(LIBXML2_WITH_HTTP OFF CACHE BOOL "LibXml2 HTTP support")
     set(LIBXML2_WITH_ICONV OFF CACHE BOOL "LibXml2 ICONV")
@@ -16,7 +17,7 @@ else(LibXml2_FOUND)
     set(LIBXML2_WITH_TESTS OFF CACHE BOOL "LibXml2 Tests")
     FetchContent_Declare(LibXml2
             GIT_REPOSITORY https://gitlab.gnome.org/GNOME/libxml2
-            GIT_TAG v2.10.3
+            GIT_TAG v2.11.4
             GIT_SHALLOW ON
             GIT_PROGRESS ON
             UPDATE_DISCONNECTED ON
diff --git a/getlibs/getlibs.sh b/getlibs/getlibs.sh
index 606177ab..cd45afcf 100755
--- a/getlibs/getlibs.sh
+++ b/getlibs/getlibs.sh
@@ -19,10 +19,12 @@ for target in "$@" ; do
         prepare_libxml2
         BUILD="$LIBS/build-${LIBXML2}"
         echo -e "${BW}${target}: Configuring ${LIBXML2}${NC}"
-        cmake -S "$SOURCE/$LIBXML2" -B "$BUILD" -DCMAKE_TOOLCHAIN_FILE="$PROJECT_DIR/cmake/toolchain/${target}.cmake" \
+        cmake -S "$SOURCE/$LIBXML2" -B "$BUILD" \
+          -DCMAKE_TOOLCHAIN_FILE="$PROJECT_DIR/cmake/toolchain/${target}.cmake" \
           -DCMAKE_PREFIX_PATH="$LIBS" -DCMAKE_INSTALL_PREFIX="$LIBS" -DCMAKE_BUILD_TYPE=Release \
           -DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_FTP=OFF -DLIBXML2_WITH_HTTP=OFF \
-          -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF
+          -DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF \
+          -DLIBXML2_WITH_THREADS=OFF -DLIBXML2_WITH_TESTS=OFF
         echo -e "${BW}${target}: Building ${LIBXML2}${NC}"
         cmake --build "$BUILD"
         echo -e "${BW}${target}: Testing ${LIBXML2}${NC}"