# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1510159797 -3600
# Node ID 5a650eef0794669ab6ec72afaa34b13fb4fee7ff
# Parent  14537babc1e6bc791a5264f74bcc0036780e0112
Upgrade to Boost 1.65.1 in static builds

diff -r 14537babc1e6 -r 5a650eef0794 NEWS
--- a/NEWS	Mon Oct 30 09:48:32 2017 +0100
+++ b/NEWS	Wed Nov 08 17:49:57 2017 +0100
@@ -26,6 +26,7 @@
 * Experimental support of actively maintained Civetweb to replace Mongoose 3.8
 * Fix issue 64 (OpenBSD support)
 * Fix static compilation of DCMTK 3.6.2 on Fedora
+* Upgrade to Boost 1.65.1 in static builds
 
 
 Version 1.3.0 (2017-07-19)
diff -r 14537babc1e6 -r 5a650eef0794 Resources/CMake/BoostConfiguration.cmake
--- a/Resources/CMake/BoostConfiguration.cmake	Mon Oct 30 09:48:32 2017 +0100
+++ b/Resources/CMake/BoostConfiguration.cmake	Wed Nov 08 17:49:57 2017 +0100
@@ -41,9 +41,9 @@
   ## Parameters for static compilation of Boost 
   ##
   
-  set(BOOST_NAME boost_1_64_0)
-  set(BOOST_BCP_SUFFIX bcpdigest-1.3.0)
-  set(BOOST_MD5 "ecb266cf46adcc7f695ad12685871174")
+  set(BOOST_NAME boost_1_65_1)
+  set(BOOST_BCP_SUFFIX bcpdigest-1.3.1)
+  set(BOOST_MD5 "92c9c603e56bbd7a450a305f08747d90")
   set(BOOST_URL "http://www.orthanc-server.com/downloads/third-party/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz")
   set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
 
diff -r 14537babc1e6 -r 5a650eef0794 Resources/CMake/BoostConfiguration.sh
--- a/Resources/CMake/BoostConfiguration.sh	Mon Oct 30 09:48:32 2017 +0100
+++ b/Resources/CMake/BoostConfiguration.sh	Wed Nov 08 17:49:57 2017 +0100
@@ -16,22 +16,26 @@
 ##   - Orthanc between 0.9.2 and 0.9.4: Boost 1.58.0
 ##   - Orthanc between 0.9.5 and 1.0.0: Boost 1.59.0
 ##   - Orthanc between 1.1.0 and 1.2.0: Boost 1.60.0
-##   - Orthanc >= 1.3.0: Boost 1.64.0
+##   - Orthanc 1.3.0: Boost 1.64.0
+##   - Orthanc >= 1.3.1: Boost 1.65.1
 
-rm -rf /tmp/boost_1_64_0
-rm -rf /tmp/bcp/boost_1_64_0
+BOOST_VERSION=1_65_1
+ORTHANC_VERSION=1.3.1
+
+rm -rf /tmp/boost_${BOOST_VERSION}
+rm -rf /tmp/bcp/boost_${BOOST_VERSION}
 
 cd /tmp
-echo "Uncompressing the sources of Boost 1.64.0..."
-tar xfz ./boost_1_64_0.tar.gz 
+echo "Uncompressing the sources of Boost ${BOOST_VERSION}..."
+tar xfz ./boost_${BOOST_VERSION}.tar.gz 
 
 echo "Generating the subset..."
-mkdir -p /tmp/bcp/boost_1_64_0
-bcp --boost=/tmp/boost_1_64_0 thread system locale date_time filesystem math/special_functions algorithm uuid atomic iostreams program_options numeric/ublas /tmp/bcp/boost_1_64_0
+mkdir -p /tmp/bcp/boost_${BOOST_VERSION}
+bcp --boost=/tmp/boost_${BOOST_VERSION} thread system locale date_time filesystem math/special_functions algorithm uuid atomic iostreams program_options numeric/ublas geometry polygon /tmp/bcp/boost_${BOOST_VERSION}
 cd /tmp/bcp
 
 echo "Compressing the subset..."
-tar cfz boost_1_64_0_bcpdigest-1.3.0.tar.gz boost_1_64_0
-ls -l boost_1_64_0_bcpdigest-1.3.0.tar.gz
-md5sum boost_1_64_0_bcpdigest-1.3.0.tar.gz
-readlink -f boost_1_64_0_bcpdigest-1.3.0.tar.gz
+tar cfz boost_${BOOST_VERSION}_bcpdigest-${ORTHANC_VERSION}.tar.gz boost_${BOOST_VERSION}
+ls -l boost_${BOOST_VERSION}_bcpdigest-${ORTHANC_VERSION}.tar.gz
+md5sum boost_${BOOST_VERSION}_bcpdigest-${ORTHANC_VERSION}.tar.gz
+readlink -f boost_${BOOST_VERSION}_bcpdigest-${ORTHANC_VERSION}.tar.gz
diff -r 14537babc1e6 -r 5a650eef0794 UnitTestsSources/VersionsTests.cpp
--- a/UnitTestsSources/VersionsTests.cpp	Mon Oct 30 09:48:32 2017 +0100
+++ b/UnitTestsSources/VersionsTests.cpp	Wed Nov 08 17:49:57 2017 +0100
@@ -104,7 +104,7 @@
 
 TEST(Versions, BoostStatic)
 {
-  ASSERT_STREQ("1_64", BOOST_LIB_VERSION);
+  ASSERT_STREQ("1_65_1", BOOST_LIB_VERSION);
 }
 
 TEST(Versions, CurlStatic)