Mercurial > hg > orthanc
changeset 2525:94423976888e
boost 1.66.0
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 11 Apr 2018 12:10:07 +0200 |
| parents | a29ffb73f6fd |
| children | 1c37d6af7aa5 |
| files | NEWS Resources/CMake/BoostConfiguration.cmake Resources/CMake/BoostConfiguration.sh Resources/LinuxStandardBaseToolchain.cmake Resources/Patches/boost-1.66.0-linux-standard-base.patch |
| diffstat | 5 files changed, 26 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/NEWS Tue Apr 10 17:33:26 2018 +0200 +++ b/NEWS Wed Apr 11 12:10:07 2018 +0200 @@ -35,6 +35,7 @@ * Possibility of using JsonCpp 0.10.6 if the compiler does not support C++11 with the "-DUSE_LEGACY_JSONCPP=ON" CMake option * Upgraded dependencies for static and Windows builds: + - boost 1.66.0 - curl 7.57.0 - jsoncpp 1.8.4 - zlib 1.2.11
--- a/Resources/CMake/BoostConfiguration.cmake Tue Apr 10 17:33:26 2018 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Wed Apr 11 12:10:07 2018 +0200 @@ -53,9 +53,9 @@ ## Parameters for static compilation of Boost ## - set(BOOST_NAME boost_1_65_1) - set(BOOST_BCP_SUFFIX bcpdigest-1.3.1) - set(BOOST_MD5 "92c9c603e56bbd7a450a305f08747d90") + set(BOOST_NAME boost_1_66_0) + set(BOOST_BCP_SUFFIX bcpdigest-1.3.2) + set(BOOST_MD5 "4e15b0fd883528be159be9661b6ba20a") 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}) @@ -97,11 +97,13 @@ ) if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") - add_definitions(-DBOOST_SYSTEM_USE_STRERROR=1) + add_definitions( + -DBOOST_SYSTEM_USE_STRERROR=1 + ) execute_process( COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/boost-1.65.1-linux-standard-base.patch + ${ORTHANC_ROOT}/Resources/Patches/boost-1.66.0-linux-standard-base.patch WORKING_DIRECTORY ${CMAKE_BINARY_DIR} RESULT_VARIABLE Failure )
--- a/Resources/CMake/BoostConfiguration.sh Tue Apr 10 17:33:26 2018 +0200 +++ b/Resources/CMake/BoostConfiguration.sh Wed Apr 11 12:10:07 2018 +0200 @@ -17,10 +17,11 @@ ## - 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.1: Boost 1.65.1 +## - Orthanc 1.3.1: Boost 1.65.1 +## - Orthanc >= 1.3.2: Boost 1.66.0 -BOOST_VERSION=1_65_1 -ORTHANC_VERSION=1.3.1 +BOOST_VERSION=1_66_0 +ORTHANC_VERSION=1.3.2 rm -rf /tmp/boost_${BOOST_VERSION} rm -rf /tmp/bcp/boost_${BOOST_VERSION}
--- a/Resources/LinuxStandardBaseToolchain.cmake Tue Apr 10 17:33:26 2018 +0200 +++ b/Resources/LinuxStandardBaseToolchain.cmake Wed Apr 11 12:10:07 2018 +0200 @@ -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 +# 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 INCLUDE(CMakeForceCompiler)
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/Resources/Patches/boost-1.66.0-linux-standard-base.patch Wed Apr 11 12:10:07 2018 +0200 @@ -0,0 +1,13 @@ +diff -urEb boost_1_66_0.orig/boost/move/adl_move_swap.hpp boost_1_66_0/boost/move/adl_move_swap.hpp +--- boost_1_66_0.orig/boost/move/adl_move_swap.hpp 2018-04-11 11:56:16.761768726 +0200 ++++ boost_1_66_0/boost/move/adl_move_swap.hpp 2018-04-11 11:57:01.073881330 +0200 +@@ -28,6 +28,8 @@ + //Try to avoid including <algorithm>, as it's quite big + #if defined(_MSC_VER) && defined(BOOST_DINKUMWARE_STDLIB) + #include <utility> //Dinkum libraries define std::swap in utility which is lighter than algorithm ++#elif defined(__LSB_VERSION__) ++# include <utility> + #elif defined(BOOST_GNU_STDLIB) + //For non-GCC compilers, where GNUC version is not very reliable, or old GCC versions + //use the good old stl_algobase header, which is quite lightweight +Only in boost_1_66_0/boost/move: adl_move_swap.hpp~