Skip to content

Commit

Permalink
Simplified dependency to LibXml2 and updated the version number
Browse files Browse the repository at this point in the history
  • Loading branch information
mikucionisaau committed Aug 16, 2023
1 parent 52d1348 commit b404e65
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 4 deletions.
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
@@ -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)

Expand Down
3 changes: 2 additions & 1 deletion cmake/libxml2.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Expand All @@ -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
Expand Down
6 changes: 4 additions & 2 deletions getlibs/getlibs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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}"
Expand Down

0 comments on commit b404e65

Please sign in to comment.