Skip to content

Commit

Permalink
Bump libxml2 to v2.11.5 (#422)
Browse files Browse the repository at this point in the history
  • Loading branch information
beutlich authored Oct 24, 2023
1 parent fbbbc85 commit 609b2ec
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 8 deletions.
6 changes: 3 additions & 3 deletions ThirdParty/.gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
cvode-6.4.1/
libxml2-2.10.3/
zlib-1.3/
cvode-*/
libxml2-*/
zlib-*/
9 changes: 5 additions & 4 deletions ThirdParty/build_libxml2.py
Original file line number Diff line number Diff line change
Expand Up @@ -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'

Expand All @@ -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([
Expand Down
2 changes: 1 addition & 1 deletion fmusim/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -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/)
Expand Down

0 comments on commit 609b2ec

Please sign in to comment.