Mercurial > hg > orthanc

changeset 6463:6874547dca66

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix patch application
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 19 Nov 2025 18:30:51 +0100
parents 0f829c4c8bbf
children 621cb02ff962
files OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake OrthancFramework/Resources/CMake/LibP11Configuration.cmake OrthancFramework/Resources/CMake/MongooseConfiguration.cmake
diffstat 3 files changed, 23 insertions(+), 19 deletions(-) [+]
line wrap: on
line diff
--- a/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake	Wed Nov 19 18:02:22 2025 +0100
+++ b/OrthancFramework/Resources/CMake/DcmtkConfigurationStatic-3.6.0.cmake	Wed Nov 19 18:30:51 2025 +0100
@@ -109,15 +109,17 @@
   SET(DCMTK_ENABLE_CHARSET_CONVERSION "iconv" CACHE STRING "")
   SET(HAVE_SYS_GETTID 0 CACHE INTERNAL "")
 
-  execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-    ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch
-    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-    RESULT_VARIABLE Failure
-    )
+  if (FirstRun)
+    execute_process(
+      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+      ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.2-linux-standard-base.patch
+      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+      RESULT_VARIABLE Failure
+      )
 
-  if (FirstRun AND Failure)
-    message(FATAL_ERROR "Error while patching a file")
+    if (Failure)
+      message(FATAL_ERROR "Error while patching a file")
+    endif()
   endif()
 endif()
 
@@ -182,16 +184,18 @@
     )
 
   if (CMAKE_COMPILER_IS_GNUCXX)
-    # This is a patch for DCMTK 3.6.0 and MinGW64
-    execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
-      ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-mingw64.patch
-      WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
-      RESULT_VARIABLE Failure
-      )
+    if (FirstRun)
+      # This is a patch for DCMTK 3.6.0 and MinGW64
+      execute_process(
+        COMMAND ${PATCH_EXECUTABLE} -p0 -N -i
+        ${CMAKE_CURRENT_LIST_DIR}/../Patches/dcmtk-3.6.0-mingw64.patch
+        WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+        RESULT_VARIABLE Failure
+        )
 
-    if (Failure AND FirstRun)
-      message(FATAL_ERROR "Error while patching a file")
+      if (Failure)
+        message(FATAL_ERROR "Error while patching a file")
+      endif()
     endif()
   endif()
 endif()
--- a/OrthancFramework/Resources/CMake/LibP11Configuration.cmake	Wed Nov 19 18:02:22 2025 +0100
+++ b/OrthancFramework/Resources/CMake/LibP11Configuration.cmake	Wed Nov 19 18:30:51 2025 +0100
@@ -45,7 +45,7 @@
       RESULT_VARIABLE Failure
       )
 
-    if (FirstRun)
+    if (Failure)
       message(FATAL_ERROR "Error while patching libp11")
     endif()
   endif()
--- a/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake	Wed Nov 19 18:02:22 2025 +0100
+++ b/OrthancFramework/Resources/CMake/MongooseConfiguration.cmake	Wed Nov 19 18:30:51 2025 +0100
@@ -59,7 +59,7 @@
       RESULT_VARIABLE Failure
       )
 
-    if (FirstRun)
+    if (Failure)
       message(FATAL_ERROR "Error while patching a file")
     endif()
   endif()