Mercurial > hg > orthanc
changeset 4390:ee846712f5df
upgraded to jsoncpp 1.9.3
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 21 Dec 2020 08:41:13 +0100 |
| parents | ab5b68f7e948 |
| children | 0c4ff5609548 |
| files | NEWS OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake OrthancServer/UnitTestsSources/VersionsTests.cpp |
| diffstat | 3 files changed, 7 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Fri Dec 18 17:41:42 2020 +0100 +++ b/NEWS Mon Dec 21 08:41:13 2020 +0100 @@ -1,6 +1,9 @@ Pending changes in the mainline =============================== +* Upgraded dependencies for static builds (notably on Windows): + - jsoncpp 1.9.3 + Version 1.8.2 (2020-12-18) ==========================
--- a/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake Fri Dec 18 17:41:42 2020 +0100 +++ b/OrthancFramework/Resources/CMake/JsonCppConfiguration.cmake Mon Dec 21 08:41:13 2020 +0100 @@ -27,9 +27,9 @@ set(JSONCPP_MD5 "3a8072ca6a1fa9cbaf7715ae625f134f") add_definitions(-DORTHANC_LEGACY_JSONCPP=1) else() - set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.8.4) - set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-1.8.4.tar.gz") - set(JSONCPP_MD5 "fa47a3ab6b381869b6a5f20811198662") + set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-1.9.3) + set(JSONCPP_URL "http://orthanc.osimis.io/ThirdPartyDownloads/jsoncpp-1.9.3.tar.gz") + set(JSONCPP_MD5 "288bedd396758709e517fcc4acad6ac2") add_definitions(-DORTHANC_LEGACY_JSONCPP=0) set(JSONCPP_CXX11 ON) endif()
--- a/OrthancServer/UnitTestsSources/VersionsTests.cpp Fri Dec 18 17:41:42 2020 +0100 +++ b/OrthancServer/UnitTestsSources/VersionsTests.cpp Mon Dec 21 08:41:13 2020 +0100 @@ -190,7 +190,7 @@ #if ORTHANC_LEGACY_JSONCPP == 1 ASSERT_STREQ("0.10.6", JSONCPP_VERSION_STRING); #elif ORTHANC_LEGACY_JSONCPP == 0 - ASSERT_STREQ("1.8.4", JSONCPP_VERSION_STRING); + ASSERT_STREQ("1.9.3", JSONCPP_VERSION_STRING); #else # error Macro ORTHANC_LEGACY_JSONCPP should be set #endif