diff --git a/ThirdParty/.gitignore b/ThirdParty/.gitignore index 9d973c47..5aa94111 100644 --- a/ThirdParty/.gitignore +++ b/ThirdParty/.gitignore @@ -1,3 +1,3 @@ -cvode-6.4.1/ -libxml2-2.10.3/ -zlib-1.3/ +cvode-*/ +libxml2-*/ +zlib-*/ diff --git a/ThirdParty/build_libxml2.py b/ThirdParty/build_libxml2.py index c0a56c2e..9a76614d 100644 --- a/ThirdParty/build_libxml2.py +++ b/ThirdParty/build_libxml2.py @@ -6,14 +6,14 @@ from fmpy import extract -archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.10.3.zip', - checksum='098b62c128e8a9c766fb1cd93902c939960b7a9263d7612588960e7b672d7064') +archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.zip', + checksum='711675470075cc85ba450f56aff7424f1ecdef00bc5d1d5dced3ffecd1a9b772') root = Path(__file__).parent extract(archive, root) -build_dir = root / 'libxml2-2.10.3' / 'build' +build_dir = root / 'libxml2-2.11.5' / 'build' install_prefix = build_dir / 'install' @@ -36,7 +36,8 @@ '-D', 'LIBXML2_WITH_LZMA=OFF', '-D', 'LIBXML2_WITH_PYTHON=OFF', '-D', 'LIBXML2_WITH_ZLIB=OFF', - root / 'libxml2-2.10.3'] + '-D', 'LIBXML2_WITH_TESTS=OFF', + root / 'libxml2-2.11.5'] ) check_call([ diff --git a/fmusim/CMakeLists.txt b/fmusim/CMakeLists.txt index 8313f1a0..d3f794bc 100644 --- a/fmusim/CMakeLists.txt +++ b/fmusim/CMakeLists.txt @@ -2,7 +2,7 @@ cmake_minimum_required (VERSION 3.17) set(CMAKE_MSVC_RUNTIME_LIBRARY MultiThreaded) -set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/ThirdParty/libxml2-2.10.3/build/install/) +set(LIBXML2_DIR ${CMAKE_SOURCE_DIR}/ThirdParty/libxml2-2.11.5/build/install/) set(ZLIB_DIR ${CMAKE_SOURCE_DIR}/ThirdParty/zlib-1.3/build/install/) set(ZLIB_SRC_DIR ${CMAKE_SOURCE_DIR}/ThirdParty/zlib-1.3/) set(CVODE_DIR ${CMAKE_SOURCE_DIR}/ThirdParty/cvode-6.4.1/build/install/)