# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1397638801 -7200
# Node ID a6576b4785537b244e8db39f6e938d5d041c0573
# Parent  45715eadc2e03a747aec111dcd77dff81b4ecdf1
upgrade to boost 1.55.0

diff -r 45715eadc2e0 -r a6576b478553 NEWS
--- a/NEWS	Mon Apr 14 17:17:38 2014 +0200
+++ b/NEWS	Wed Apr 16 11:00:01 2014 +0200
@@ -2,6 +2,7 @@
 ===============================
 
 * Switch to openssl-1.0.1g in static builds (cf. Heartbleed exploit)
+* Switch to boost 1.55.0 in static builds (to solve compiling errors)
 * Better logging about nonexistent tags
 * Dcm4Chee manufacturer
 * Automatic discovering of the path to the DICOM dictionaries
diff -r 45715eadc2e0 -r a6576b478553 Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Mon Apr 14 17:17:38 2014 +0200
+++ b/Resources/CMake/BoostConfiguration.cmake	Wed Apr 16 11:00:01 2014 +0200
@@ -39,10 +39,10 @@
 
 
 if (BOOST_STATIC)
-  # Parameters for Boost 1.54.0
-  set(BOOST_NAME boost_1_54_0)
-  set(BOOST_BCP_SUFFIX bcpdigest-0.6.2)
-  set(BOOST_MD5 "a464288a976ba133f9b325f454cb503d")
+  # Parameters for Boost 1.55.0
+  set(BOOST_NAME boost_1_55_0)
+  set(BOOST_BCP_SUFFIX bcpdigest-0.7.4)
+  set(BOOST_MD5 "409f7a0e4fb1f5659d07114f3133b67b")
   set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src")
   
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
diff -r 45715eadc2e0 -r a6576b478553 Resources/CMake/BoostConfiguration.sh
--- a/Resources/CMake/BoostConfiguration.sh	Mon Apr 14 17:17:38 2014 +0200
+++ b/Resources/CMake/BoostConfiguration.sh	Wed Apr 16 11:00:01 2014 +0200
@@ -9,21 +9,25 @@
 ## http://www.boost.org/doc/libs/1_54_0/tools/bcp/doc/html/index.html
 ##
 ## This script generates this subset.
+##
+## History:
+##   - Orthanc between 0.6.2 and 0.7.3: Boost 1.54.0
+##   - Orthanc above 0.7.4: Boost 1.55.0
 
-rm -rf /tmp/boost_1_54_0
-rm -rf /tmp/bcp/boost_1_54_0
+rm -rf /tmp/boost_1_55_0
+rm -rf /tmp/bcp/boost_1_55_0
 
 cd /tmp
-echo "Uncompressing the source of Boost 1.54.0..."
-tar xfz boost_1_54_0.tar.gz 
+echo "Uncompressing the source of Boost 1.55.0..."
+tar xfz boost_1_55_0.tar.gz 
 
 echo "Generating the subset..."
-mkdir -p /tmp/bcp/boost_1_54_0
-bcp --boost=/tmp/boost_1_54_0 thread system locale date_time filesystem math/special_functions algorithm uuid /tmp/bcp/boost_1_54_0
+mkdir -p /tmp/bcp/boost_1_55_0
+bcp --boost=/tmp/boost_1_55_0 thread system locale date_time filesystem math/special_functions algorithm uuid /tmp/bcp/boost_1_55_0
 cd /tmp/bcp
 
 echo "Compressing the subset..."
-tar cfz boost_1_54_0_bcpdigest-0.6.2.tar.gz boost_1_54_0
-ls -l boost_1_54_0_bcpdigest-0.6.2.tar.gz
-md5sum boost_1_54_0_bcpdigest-0.6.2.tar.gz
-readlink -f boost_1_54_0_bcpdigest-0.6.2.tar.gz
+tar cfz boost_1_55_0_bcpdigest-0.7.4.tar.gz boost_1_55_0
+ls -l boost_1_55_0_bcpdigest-0.7.4.tar.gz
+md5sum boost_1_55_0_bcpdigest-0.7.4.tar.gz
+readlink -f boost_1_55_0_bcpdigest-0.7.4.tar.gz
diff -r 45715eadc2e0 -r a6576b478553 UnitTestsSources/Versions.cpp
--- a/UnitTestsSources/Versions.cpp	Mon Apr 14 17:17:38 2014 +0200
+++ b/UnitTestsSources/Versions.cpp	Wed Apr 16 11:00:01 2014 +0200
@@ -58,7 +58,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_STREQ("1_54", BOOST_LIB_VERSION);
+  ASSERT_STREQ("1_55", BOOST_LIB_VERSION);
 }
 
 TEST(Versions, CurlStatic)