# HG changeset patch # User Sebastien Jodogne # Date 1539347874 -7200 # Node ID 320a877a1f4016025d5fae236a1167f3eca56438 # Parent fae5004116056cdc9bb52eb1d49e214f5681b1fe making the boost patch mandatory diff -r fae500411605 -r 320a877a1f40 Resources/CMake/BoostConfiguration.cmake --- a/Resources/CMake/BoostConfiguration.cmake Fri Oct 12 14:33:03 2018 +0200 +++ b/Resources/CMake/BoostConfiguration.cmake Fri Oct 12 14:37:54 2018 +0200 @@ -70,6 +70,22 @@ ## + ## Patching boost + ## + + execute_process( + COMMAND ${PATCH_EXECUTABLE} -p0 -N -i + ${ORTHANC_ROOT}/Resources/Patches/boost-${BOOST_VERSION}-linux-standard-base.patch + WORKING_DIRECTORY ${CMAKE_BINARY_DIR} + RESULT_VARIABLE Failure + ) + + if (FirstRun AND Failure) + message(FATAL_ERROR "Error while patching a file") + endif() + + + ## ## Generic configuration of Boost ## @@ -102,17 +118,6 @@ add_definitions( -DBOOST_SYSTEM_USE_STRERROR=1 ) - - execute_process( - COMMAND ${PATCH_EXECUTABLE} -p0 -N -i - ${ORTHANC_ROOT}/Resources/Patches/boost-${BOOST_VERSION}-linux-standard-base.patch - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - RESULT_VARIABLE Failure - ) - - if (FirstRun AND Failure) - message(FATAL_ERROR "Error while patching a file") - endif() endif()