Mercurial > hg > orthanc
changeset 1931:687ff92d173b
Upgrade to Boost 1.60.0 for static builds
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 21 Mar 2016 15:15:01 +0100 |
| parents | 1c147c3c3121 |
| children | 2d46e378960d |
| files | NEWS Resources/CMake/BoostConfiguration.cmake Resources/CMake/BoostConfiguration.sh UnitTestsSources/VersionsTests.cpp |
| diffstat | 4 files changed, 18 insertions(+), 16 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Mon Mar 21 14:37:58 2016 +0100 +++ b/NEWS Mon Mar 21 15:15:01 2016 +0100 @@ -10,6 +10,7 @@ * Refactoring leading to speedups with custom image decoders (including Web viewer plugin) * Support decoding of RLE Lossless transfer syntax * Fix issue 11 (is_regular_file() fails for FILE_ATTRIBUTE_REPARSE_POINT) +* Upgrade to Boost 1.60.0 for static builds Version 1.0.0 (2015/12/15)
--- a/Resources/CMake/BoostConfiguration.cmake Mon Mar 21 14:37:58 2016 +0100 +++ b/Resources/CMake/BoostConfiguration.cmake Mon Mar 21 15:15:01 2016 +0100 @@ -39,10 +39,10 @@ if (BOOST_STATIC) - # Parameters for Boost 1.59.0 - set(BOOST_NAME boost_1_59_0) - set(BOOST_BCP_SUFFIX bcpdigest-0.9.5) - set(BOOST_MD5 "08abb7cdbea0b380f9ab0d5cce476f12") + # Parameters for Boost 1.60.0 + set(BOOST_NAME boost_1_60_0) + set(BOOST_BCP_SUFFIX bcpdigest-1.0.1) + set(BOOST_MD5 "0646971514a1e012fbe382c5662a8605") set(BOOST_URL "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/${BOOST_NAME}_${BOOST_BCP_SUFFIX}.tar.gz") set(BOOST_FILESYSTEM_SOURCES_DIR "${BOOST_NAME}/libs/filesystem/src") set(BOOST_SOURCES_DIR ${CMAKE_BINARY_DIR}/${BOOST_NAME})
--- a/Resources/CMake/BoostConfiguration.sh Mon Mar 21 14:37:58 2016 +0100 +++ b/Resources/CMake/BoostConfiguration.sh Mon Mar 21 15:15:01 2016 +0100 @@ -14,22 +14,23 @@ ## - Orthanc between 0.6.2 and 0.7.3: Boost 1.54.0 ## - Orthanc between 0.7.4 and 0.9.1: Boost 1.55.0 ## - Orthanc between 0.9.2 and 0.9.4: Boost 1.58.0 -## - Orthanc >= 0.9.5: Boost 1.59.0 +## - Orthanc between 0.9.5 and 1.0.0: Boost 1.59.0 +## - Orthanc >= 1.0.1: Boost 1.60.0 -rm -rf /tmp/boost_1_59_0 -rm -rf /tmp/bcp/boost_1_59_0 +rm -rf /tmp/boost_1_60_0 +rm -rf /tmp/bcp/boost_1_60_0 cd /tmp -echo "Uncompressing the sources of Boost 1.59.0..." -tar xfz ./boost_1_59_0.tar.gz +echo "Uncompressing the sources of Boost 1.60.0..." +tar xfz ./boost_1_60_0.tar.gz echo "Generating the subset..." -mkdir -p /tmp/bcp/boost_1_59_0 -bcp --boost=/tmp/boost_1_59_0 thread system locale date_time filesystem math/special_functions algorithm uuid atomic iostreams /tmp/bcp/boost_1_59_0 +mkdir -p /tmp/bcp/boost_1_60_0 +bcp --boost=/tmp/boost_1_60_0 thread system locale date_time filesystem math/special_functions algorithm uuid atomic iostreams program_options /tmp/bcp/boost_1_60_0 cd /tmp/bcp echo "Compressing the subset..." -tar cfz boost_1_59_0_bcpdigest-0.9.5.tar.gz boost_1_59_0 -ls -l boost_1_59_0_bcpdigest-0.9.5.tar.gz -md5sum boost_1_59_0_bcpdigest-0.9.5.tar.gz -readlink -f boost_1_59_0_bcpdigest-0.9.5.tar.gz +tar cfz boost_1_60_0_bcpdigest-1.0.1.tar.gz boost_1_60_0 +ls -l boost_1_60_0_bcpdigest-1.0.1.tar.gz +md5sum boost_1_60_0_bcpdigest-1.0.1.tar.gz +readlink -f boost_1_60_0_bcpdigest-1.0.1.tar.gz
--- a/UnitTestsSources/VersionsTests.cpp Mon Mar 21 14:37:58 2016 +0100 +++ b/UnitTestsSources/VersionsTests.cpp Mon Mar 21 15:15:01 2016 +0100 @@ -102,7 +102,7 @@ TEST(Versions, BoostStatic) { - ASSERT_STREQ("1_59", BOOST_LIB_VERSION); + ASSERT_STREQ("1_60", BOOST_LIB_VERSION); } TEST(Versions, CurlStatic)