Mercurial > hg > orthanc

changeset 5508:ababd0af28ab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded to pugixml 1.14
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 18:08:17 +0100
parents 11a140c73bb6
children 46fa46c83628
files NEWS OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 12 insertions(+), 10 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jan 24 18:02:58 2024 +0100
+++ b/NEWS	Wed Jan 24 18:08:17 2024 +0100
@@ -18,6 +18,7 @@
   - libpng 1.6.40
   - openssl 3.1.4
   - zlib 1.3.1
+  - pugixml 1.14
 
 
 Version 1.12.2 (2023-12-19)
--- a/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 18:02:58 2024 +0100
+++ b/OrthancFramework/Resources/CMake/PugixmlConfiguration.cmake	Wed Jan 24 18:08:17 2024 +0100
@@ -20,13 +20,14 @@
 
 
 if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML)
-  set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.9)
-  set(PUGIXML_MD5 "7286ee2ed11376b6b780ced19fae0b64")
-  set(PUGIXML_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/pugixml-1.9.tar.gz")
+  set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.14)
+  set(PUGIXML_MD5 "06e4242ee2352ee63c2b6627c6e3addb")
+  set(PUGIXML_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/pugixml-1.14.tar.gz")
 
   DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
 
   include_directories(
+    BEFORE SYSTEM
     ${PUGIXML_SOURCES_DIR}/src
     )
 
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 18:02:58 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 18:08:17 2024 +0100
@@ -148,14 +148,14 @@
 #endif
 }
 
-TEST(Version, LuaStatic)
+TEST(Versions, LuaStatic)
 {
   ASSERT_STREQ("Lua 5.3.5", LUA_RELEASE);
 }
 
 
 #if BUILDING_LIBICONV == 1
-TEST(Version, LibIconvStatic)
+TEST(Versions, LibIconvStatic)
 {
   static const int major = 1;
   static const int minor = 15;  
@@ -165,7 +165,7 @@
 
 
 #if ORTHANC_ENABLE_SSL == 1
-TEST(Version, OpenSslStatic)
+TEST(Versions, OpenSslStatic)
 {
   // openssl-3.1.4
   // https://www.openssl.org/docs/man3.0/man3/OPENSSL_VERSION_NUMBER.html
@@ -178,7 +178,7 @@
 
 #include <json/version.h>
 
-TEST(Version, JsonCpp)
+TEST(Versions, JsonCpp)
 {
 #if ORTHANC_LEGACY_JSONCPP == 1
   ASSERT_STREQ("0.10.6", JSONCPP_VERSION_STRING);
@@ -191,7 +191,7 @@
 
 
 #if ORTHANC_ENABLE_CIVETWEB == 1
-TEST(Version, Civetweb)
+TEST(Versions, Civetweb)
 {
   ASSERT_EQ(1, CIVETWEB_VERSION_MAJOR);
   ASSERT_EQ(14, CIVETWEB_VERSION_MINOR);
@@ -201,9 +201,9 @@
 
 
 #if ORTHANC_ENABLE_PUGIXML == 1
-TEST(Version, Pugixml)
+TEST(Versions, Pugixml)
 {
-  ASSERT_EQ(190, PUGIXML_VERSION);
+  ASSERT_EQ(1140, PUGIXML_VERSION);
 }
 #endif