Mercurial > hg > orthanc

changeset 1502:5e9c40419fb9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Upgrade to JsonCpp 0.10.5 for static and Windows builds
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 07 Aug 2015 17:39:45 +0200
parents aaf368280f5a
children 4320cfcfabef 918ff09b5ac2
files INSTALL NEWS Resources/CMake/JsonCppConfiguration.cmake UnitTestsSources/VersionsTests.cpp
diffstat 4 files changed, 21 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/INSTALL	Fri Aug 07 17:23:28 2015 +0200
+++ b/INSTALL	Fri Aug 07 17:39:45 2015 +0200
@@ -41,12 +41,15 @@
 3) Depending on your platform, follow the build instructions below.
 
 
-WARNING: If you do not create a fresh "~/OrthancBuild" directory after
-upgrading the source code (i.e. if you reuse the build directory that
-was used to build a different version of Orthanc), the build might
-fail because of changes in the compilation/linking flags. Always
+WARNING 1: If you do not create a fresh "~/OrthancBuild" directory
+after upgrading the source code (i.e. if you reuse the build directory
+that was used to build a different version of Orthanc), the build
+might fail because of changes in the compilation/linking flags. Always
 prefer to force a re-build in a new directory.
 
+WARNING 2: If cmake complains about not being able to uncompress
+third-party dependencies, delete the "~/Orthanc/ThirdPartyDownloads/"
+folder, then restart cmake.
 
 
 Native Linux Compilation
--- a/NEWS	Fri Aug 07 17:23:28 2015 +0200
+++ b/NEWS	Fri Aug 07 17:39:45 2015 +0200
@@ -4,12 +4,13 @@
 * C-Echo testing can be triggered from Orthanc Explorer (in the query/retrieve page)
 * Removal of the dependency upon Google Log, Orthanc now uses its internal logger 
   (use -DENABLE_GOOGLE_LOG=ON to re-enable Google Log)
+* Upgrade to JsonCpp 0.10.5 for static and Windows builds
 
 
 Version 0.9.2 (2015/08/02)
 ==========================
 
-* Update to Boost 1.58.0 for static and Windows builds
+* Upgrade to Boost 1.58.0 for static and Windows builds
 * Source code repository moved from Google Code to BitBucket
 * Inject version information into Windows binaries
 * Fix access to binary data in HTTP/REST requests by Lua scripts
--- a/Resources/CMake/JsonCppConfiguration.cmake	Fri Aug 07 17:23:28 2015 +0200
+++ b/Resources/CMake/JsonCppConfiguration.cmake	Fri Aug 07 17:39:45 2015 +0200
@@ -1,8 +1,8 @@
 if (STATIC_BUILD OR NOT USE_SYSTEM_JSONCPP)
-  set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-src-0.6.0-rc2)
+  set(JSONCPP_SOURCES_DIR ${CMAKE_BINARY_DIR}/jsoncpp-0.10.5)
   DownloadPackage(
-    "363e2f4cbd3aeb63bf4e571f377400fb"
-    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-src-0.6.0-rc2.tar.gz"
+    "db146bac5a126ded9bd728ab7b61ed6b"
+    "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/jsoncpp-0.10.5.tar.gz"
     "${JSONCPP_SOURCES_DIR}")
 
   set(JSONCPP_SOURCES
--- a/UnitTestsSources/VersionsTests.cpp	Fri Aug 07 17:23:28 2015 +0200
+++ b/UnitTestsSources/VersionsTests.cpp	Fri Aug 07 17:39:45 2015 +0200
@@ -90,6 +90,7 @@
 
 
 #if ORTHANC_STATIC == 1
+
 TEST(Versions, ZlibStatic)
 {
   ASSERT_STREQ("1.2.7", zlibVersion());
@@ -136,4 +137,12 @@
   ASSERT_EQ(0x1000107fL /* openssl-1.0.1g */, OPENSSL_VERSION_NUMBER);
 }
 
+
+#include <json/version.h>
+
+TEST(Version, JsonCpp)
+{
+  ASSERT_STREQ("0.10.5", JSONCPP_VERSION_STRING);
+}
+
 #endif