Skip to content

Commit b404e65

Browse files
committed
Simplified dependency to LibXml2 and updated the version number
1 parent 52d1348 commit b404e65

3 files changed

Lines changed: 7 additions & 4 deletions

File tree

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
cmake_minimum_required(VERSION 3.16)
2-
project(UTAP VERSION 1.1.6 LANGUAGES CXX C)
2+
project(UTAP VERSION 2.0.1 LANGUAGES CXX C)
33
include(CMakePackageConfigHelpers)
44
include(GNUInstallDirs)
55

cmake/libxml2.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@ if(LibXml2_FOUND)
66
else(LibXml2_FOUND)
77
message(STATUS "Failed to find LibXml2, going to make it from scratch.")
88
include(FetchContent)
9+
set(LIBXML2_SHARED_LIBS OFF CACHE BOOL "LibXml2 shared libraries")
910
set(LIBXML2_WITH_FTP OFF CACHE BOOL "LibXml2 FTP support")
1011
set(LIBXML2_WITH_HTTP OFF CACHE BOOL "LibXml2 HTTP support")
1112
set(LIBXML2_WITH_ICONV OFF CACHE BOOL "LibXml2 ICONV")
@@ -16,7 +17,7 @@ else(LibXml2_FOUND)
1617
set(LIBXML2_WITH_TESTS OFF CACHE BOOL "LibXml2 Tests")
1718
FetchContent_Declare(LibXml2
1819
GIT_REPOSITORY https://gitlab.gnome.org/GNOME/libxml2
19-
GIT_TAG v2.10.3
20+
GIT_TAG v2.11.4
2021
GIT_SHALLOW ON
2122
GIT_PROGRESS ON
2223
UPDATE_DISCONNECTED ON

getlibs/getlibs.sh

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,12 @@ for target in "$@" ; do
1919
prepare_libxml2
2020
BUILD="$LIBS/build-${LIBXML2}"
2121
echo -e "${BW}${target}: Configuring ${LIBXML2}${NC}"
22-
cmake -S "$SOURCE/$LIBXML2" -B "$BUILD" -DCMAKE_TOOLCHAIN_FILE="$PROJECT_DIR/cmake/toolchain/${target}.cmake" \
22+
cmake -S "$SOURCE/$LIBXML2" -B "$BUILD" \
23+
-DCMAKE_TOOLCHAIN_FILE="$PROJECT_DIR/cmake/toolchain/${target}.cmake" \
2324
-DCMAKE_PREFIX_PATH="$LIBS" -DCMAKE_INSTALL_PREFIX="$LIBS" -DCMAKE_BUILD_TYPE=Release \
2425
-DBUILD_SHARED_LIBS=OFF -DLIBXML2_WITH_FTP=OFF -DLIBXML2_WITH_HTTP=OFF \
25-
-DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF
26+
-DLIBXML2_WITH_ICONV=OFF -DLIBXML2_WITH_LZMA=OFF -DLIBXML2_WITH_PYTHON=OFF -DLIBXML2_WITH_ZLIB=OFF \
27+
-DLIBXML2_WITH_THREADS=OFF -DLIBXML2_WITH_TESTS=OFF
2628
echo -e "${BW}${target}: Building ${LIBXML2}${NC}"
2729
cmake --build "$BUILD"
2830
echo -e "${BW}${target}: Testing ${LIBXML2}${NC}"

0 commit comments

Comments
 (0)