changeset 1546:17a3814fd8a1

fix patches on windows
author jodogne
date Fri, 14 Aug 2015 11:16:17 +0200
parents 33d34bc4ac15
children 5e65349c896b
files Resources/CMake/DcmtkConfiguration.cmake Resources/CMake/MongooseConfiguration.cmake Resources/ThirdParty/patch/msys-1.0.dll Resources/ThirdParty/patch/patch.exe
diffstat 4 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/Resources/CMake/DcmtkConfiguration.cmake	Thu Aug 13 21:02:31 2015 +0200
+++ b/Resources/CMake/DcmtkConfiguration.cmake	Fri Aug 14 11:16:17 2015 +0200
@@ -136,7 +136,8 @@
 
     # This patch improves speed, even for Windows
     execute_process(
-      COMMAND ${PATCH_EXECUTABLE} -p0 -N -i ${ORTHANC_ROOT}/Resources/Patches/dcmtk-linux-speed.patch
+      COMMAND ${PATCH_EXECUTABLE} -p0 -N 
+      INPUT_FILE ${ORTHANC_ROOT}/Resources/Patches/dcmtk-linux-speed.patch
       WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
       RESULT_VARIABLE Failure
       )
--- a/Resources/CMake/MongooseConfiguration.cmake	Thu Aug 13 21:02:31 2015 +0200
+++ b/Resources/CMake/MongooseConfiguration.cmake	Fri Aug 14 11:16:17 2015 +0200
@@ -30,7 +30,8 @@
 
   # Patch mongoose
   execute_process(
-    COMMAND ${PATCH_EXECUTABLE} -N mongoose.c -i ${MONGOOSE_PATCH}
+    COMMAND ${PATCH_EXECUTABLE} -N mongoose.c 
+    INPUT_FILE ${MONGOOSE_PATCH}
     WORKING_DIRECTORY ${MONGOOSE_SOURCES_DIR}
     RESULT_VARIABLE Failure
     )
Binary file Resources/ThirdParty/patch/msys-1.0.dll has changed
Binary file Resources/ThirdParty/patch/patch.exe has changed