Mercurial > hg > orthanc

changeset 2878:320a877a1f40

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
making the boost patch mandatory
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 12 Oct 2018 14:37:54 +0200
parents fae500411605
children 497a637366b4 61a5667f37d9
files Resources/CMake/BoostConfiguration.cmake
diffstat 1 files changed, 16 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- 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()