Mercurial > hg > orthanc
changeset 3288:8d1ea00a990a
upgrade to pugixml 1.9
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 21 Feb 2019 19:17:03 +0100 |
| parents | 5e8e020893d0 |
| children | afc38fd21c78 |
| files | NEWS Resources/CMake/PugixmlConfiguration.cmake UnitTestsSources/VersionsTests.cpp |
| diffstat | 3 files changed, 18 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Thu Feb 21 18:51:36 2019 +0100 +++ b/NEWS Thu Feb 21 19:17:03 2019 +0100 @@ -23,12 +23,13 @@ * More tolerance wrt. missing DICOM tags that must be returned by Orthanc C-FIND SCP * New CMake option: "-DMSVC_MULTIPLE_PROCESSES=ON" for parallel build with Visual Studio * Upgraded dependencies for static builds (notably Windows): - - Boost 1.69.0 - - DCMTK 3.6.4 - - GoogleTest 1.8.1 + - boost 1.69.0 + - dcmtk 3.6.4 + - googletest 1.8.1 + - libjpeg 9c - libpng 1.6.36 - - libjpeg 9c - openssl 1.0.2p + - pugixml 1.9 Version 1.5.4 (2019-02-08)
--- a/Resources/CMake/PugixmlConfiguration.cmake Thu Feb 21 18:51:36 2019 +0100 +++ b/Resources/CMake/PugixmlConfiguration.cmake Thu Feb 21 19:17:03 2019 +0100 @@ -1,7 +1,7 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_PUGIXML) - set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.4) - set(PUGIXML_MD5 "7c56c91cfe3ecdee248a8e4892ef5781") - set(PUGIXML_URL "http://orthanc.osimis.io/ThirdPartyDownloads/pugixml-1.4.tar.gz") + set(PUGIXML_SOURCES_DIR ${CMAKE_BINARY_DIR}/pugixml-1.9) + set(PUGIXML_MD5 "7286ee2ed11376b6b780ced19fae0b64") + set(PUGIXML_URL "http://orthanc.osimis.io/ThirdPartyDownloads/pugixml-1.9.tar.gz") DownloadPackage(${PUGIXML_MD5} ${PUGIXML_URL} "${PUGIXML_SOURCES_DIR}")
--- a/UnitTestsSources/VersionsTests.cpp Thu Feb 21 18:51:36 2019 +0100 +++ b/UnitTestsSources/VersionsTests.cpp Thu Feb 21 19:17:03 2019 +0100 @@ -57,6 +57,10 @@ # include <civetweb.h> #endif +#if ORTHANC_ENABLE_PUGIXML == 1 +# include <pugixml.hpp> +#endif + TEST(Versions, Zlib) { @@ -194,6 +198,12 @@ #endif +#if ORTHANC_ENABLE_PUGIXML == 1 +TEST(Version, Pugixml) +{ + ASSERT_EQ(190, PUGIXML_VERSION); +} #endif +#endif