changeset 213:d200cfd84b46

sync
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 27 Feb 2019 17:00:38 +0100
parents a8c1d1fb478b
children 0a8ed9da0869 c2d729329fc7
files CMakeLists.txt NEWS Plugin/Cache/CacheIndex.h Resources/Orthanc/DownloadOrthancFramework.cmake Resources/Orthanc/LinuxStandardBaseToolchain.cmake
diffstat 5 files changed, 13 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/CMakeLists.txt	Sat Feb 23 18:18:06 2019 +0100
+++ b/CMakeLists.txt	Wed Feb 27 17:00:38 2019 +0100
@@ -27,7 +27,7 @@
   set(ORTHANC_FRAMEWORK_VERSION "mainline")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "hg")
 else()
-  set(ORTHANC_FRAMEWORK_VERSION "1.3.2")
+  set(ORTHANC_FRAMEWORK_VERSION "1.5.5")
   set(ORTHANC_FRAMEWORK_DEFAULT_SOURCE "web")
 endif()
 
--- a/NEWS	Sat Feb 23 18:18:06 2019 +0100
+++ b/NEWS	Wed Feb 27 17:00:38 2019 +0100
@@ -2,6 +2,7 @@
 ===============================
 
 * Upgrade to GDCM 2.8.8 for static builds
+* Upgraded Orthanc framework
 
 
 Version 2.4 (2018-04-23)
--- a/Plugin/Cache/CacheIndex.h	Sat Feb 23 18:18:06 2019 +0100
+++ b/Plugin/Cache/CacheIndex.h	Wed Feb 27 17:00:38 2019 +0100
@@ -33,6 +33,8 @@
     int          bundle_;
     std::string  item_;
 
+    void operator= (const CacheIndex&);  // Forbidden
+
   public:
     CacheIndex(const CacheIndex& other) :
       bundle_(other.bundle_),
--- a/Resources/Orthanc/DownloadOrthancFramework.cmake	Sat Feb 23 18:18:06 2019 +0100
+++ b/Resources/Orthanc/DownloadOrthancFramework.cmake	Wed Feb 27 17:00:38 2019 +0100
@@ -95,6 +95,14 @@
         set(ORTHANC_FRAMEWORK_MD5 "4429d8d9dea4ff6648df80ec3c64d79e")
       elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.1")
         set(ORTHANC_FRAMEWORK_MD5 "099671538865e5da96208b37494d6718")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.2")
+        set(ORTHANC_FRAMEWORK_MD5 "8867050f3e9a1ce6157c1ea7a9433b1b")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.3")
+        set(ORTHANC_FRAMEWORK_MD5 "bf2f5ed1adb8b0fc5f10d278e68e1dfe")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.4")
+        set(ORTHANC_FRAMEWORK_MD5 "404baef5d4c43e7c5d9410edda8ef5a5")
+      elseif (ORTHANC_FRAMEWORK_VERSION STREQUAL "1.5.5")
+        set(ORTHANC_FRAMEWORK_MD5 "cfc437e0687ae4bd725fd93dc1f08bc4")
       endif()
     endif()
   endif()
--- a/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Sat Feb 23 18:18:06 2019 +0100
+++ b/Resources/Orthanc/LinuxStandardBaseToolchain.cmake	Wed Feb 27 17:00:38 2019 +0100
@@ -1,4 +1,4 @@
-# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON
+# LSB_CC=gcc-4.8 LSB_CXX=g++-4.8 cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_TOOLCHAIN_FILE=../Resources/LinuxStandardBaseToolchain.cmake -DUSE_LEGACY_JSONCPP=ON -DUSE_LEGACY_LIBICU=ON -DBOOST_LOCALE_BACKEND=icu
 
 INCLUDE(CMakeForceCompiler)