Mercurial > hg > orthanc

diff Resources/CMake/GoogleLogConfiguration.cmake @ 1362:bf6db7d2f8b1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix slow DCMTK problem
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 15 May 2015 17:33:43 +0200
parents afaa55d42ddd
children 601d34afdab9
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Fri May 15 17:19:33 2015 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Fri May 15 17:33:43 2015 +0200
@@ -66,22 +66,22 @@
   if (CMAKE_COMPILER_IS_GNUCXX)
     if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
       execute_process(
-        COMMAND patch utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities-lsb.diff
+        COMMAND patch -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities-lsb.diff
         WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
         )
     else()
       execute_process(
-        COMMAND patch utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff
+        COMMAND patch -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff
         WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
         )
     endif()
 
     execute_process(
-      COMMAND patch port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 
+      COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 
       WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
       )
     execute_process(
-      COMMAND patch port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff 
+      COMMAND patch -N port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff 
       WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
       )