Mercurial > hg > orthanc

changeset 5509:46fa46c83628

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
upgraded to jsoncpp 1.9.5
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 24 Jan 2024 18:16:17 +0100
parents ababd0af28ab
children 5b3a509185b2
files NEWS OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp
diffstat 3 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/NEWS	Wed Jan 24 18:08:17 2024 +0100
+++ b/NEWS	Wed Jan 24 18:16:17 2024 +0100
@@ -14,11 +14,12 @@
   - boost 1.84.0
   - curl 8.5.0
   - dcmtk 3.6.8
+  - jsoncpp 1.9.5
   - libjpeg 9f
   - libpng 1.6.40
   - openssl 3.1.4
+  - pugixml 1.14
   - zlib 1.3.1
-  - pugixml 1.14
 
 
 Version 1.12.2 (2023-12-19)
--- a/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 18:08:17 2024 +0100
+++ b/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake	Wed Jan 24 18:16:17 2024 +0100
@@ -28,9 +28,9 @@
     set(JSONCPP_MD5 "3a8072ca6a1fa9cbaf7715ae625f134f")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=1)
   else()
-    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.9.4)
-    set(JSONCPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/jsoncpp-1.9.4.tar.gz")
-    set(JSONCPP_MD5 "4757b26ec89798c5247fa638edfdc446")
+    set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.9.5)
+    set(JSONCPP_URL "https://orthanc.uclouvain.be/downloads/third-party-downloads/jsoncpp-1.9.5.tar.gz")
+    set(JSONCPP_MD5 "d6c8c609f2162eff373db62b90a051c7")
     add_definitions(-DORTHANC_LEGACY_JSONCPP=0)
     set(JSONCPP_CXX11 ON)
   endif()
@@ -44,6 +44,7 @@
     )
 
   include_directories(
+    BEFORE SYSTEM
     ${JSONCPP_SOURCES_DIR}/include
     )
 
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 18:08:17 2024 +0100
+++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp	Wed Jan 24 18:16:17 2024 +0100
@@ -183,7 +183,7 @@
 #if ORTHANC_LEGACY_JSONCPP == 1
   ASSERT_STREQ("0.10.6", JSONCPP_VERSION_STRING);
 #elif ORTHANC_LEGACY_JSONCPP == 0
-  ASSERT_STREQ("1.9.4", JSONCPP_VERSION_STRING);
+  ASSERT_STREQ("1.9.5", JSONCPP_VERSION_STRING);
 #else
 #  error Macro ORTHANC_LEGACY_JSONCPP should be set
 #endif