Bump libxml2 to 2.13.4 (#621)

* Bump libxml2 * Include stdlib.h in FMIModelDescription.c * Link fmusim against bcrypt on Windows --------- Co-authored-by: Torsten Sommer <torsten.sommer@3ds.com>
modelica · Oct 29, 2024 · 6804b68 · 6804b68
1 parent 68e29e8
commit 6804b68
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/build/build_libxml2.py b/build/build_libxml2.py
@@ -19,8 +19,8 @@
 )
 (args, _) = parser.parse_known_args()
 
-archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.zip',
-                        checksum='711675470075cc85ba450f56aff7424f1ecdef00bc5d1d5dced3ffecd1a9b772')
+archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.13.4.zip',
+                        checksum='9d31649a3f8c0274253e57874280647c8962eed36570b714e869939c101347ba')
 
 root = Path(__file__).parent
 
@@ -71,7 +71,7 @@
     '-D', 'LIBXML2_WITH_PYTHON=OFF',
     '-D', 'LIBXML2_WITH_ZLIB=OFF',
     '-D', 'LIBXML2_WITH_TESTS=OFF',
-    root / 'libxml2-2.11.5']
+    root / 'libxml2-2.13.4']
 )
 
 check_call([

diff --git a/fmusim-gui/build/build_libxml2.py b/fmusim-gui/build/build_libxml2.py
@@ -4,8 +4,8 @@
 from fmpy import extract
 
 
-archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.11.5.zip',
-                        checksum='711675470075cc85ba450f56aff7424f1ecdef00bc5d1d5dced3ffecd1a9b772')
+archive = download_file('https://github.com/GNOME/libxml2/archive/refs/tags/v2.13.4.zip',
+                        checksum='9d31649a3f8c0274253e57874280647c8962eed36570b714e869939c101347ba')
 
 root = Path(__file__).parent
 
@@ -31,7 +31,7 @@
     '-D', 'LIBXML2_WITH_PYTHON=OFF',
     '-D', 'LIBXML2_WITH_ZLIB=OFF',
     '-D', 'LIBXML2_WITH_TESTS=OFF',
-    str(root / 'libxml2-2.11.5')]
+    str(root / 'libxml2-2.13.4')]
 )
 
 check_call([

diff --git a/fmusim/CMakeLists.txt b/fmusim/CMakeLists.txt
@@ -109,6 +109,7 @@ if (WIN32)
       ${CVODE_DIR}/lib/sundials_cvode.lib
       wsock32
       ws2_32
+      bcrypt
     )
 elseif(UNIX AND NOT APPLE)
     set(libraries

diff --git a/fmusim/FMIModelDescription.c b/fmusim/FMIModelDescription.c
@@ -2,6 +2,7 @@
 
 #include <string.h>
 #include <stdint.h>
+#include <stdlib.h>
 
 #include <libxml/parser.h>
 #include <libxml/xmlschemas.h>
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,6 +109,7 @@ if (WIN32) @@
           ${CVODE_DIR}/lib/sundials_cvode.lib
           wsock32
           ws2_32
+          bcrypt
         )
     elseif(UNIX AND NOT APPLE)
         set(libraries
@@ Expand Down @@