Mercurial > hg > orthanc

comparison Resources/CMake/GoogleLogConfiguration.cmake @ 1542:d2bccd57795e

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 13 Aug 2015 17:20:24 +0200
parents fbf763bb1fa3
children
comparison
equal deleted inserted replaced
1541:ed55880706f8 1542:d2bccd57795e
69 ) 69 )
70 70
71 if (CMAKE_COMPILER_IS_GNUCXX) 71 if (CMAKE_COMPILER_IS_GNUCXX)
72 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 72 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
73 execute_process( 73 execute_process(
74 COMMAND ${PATCH_EXECUTABLE} -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities-lsb.diff 74 COMMAND ${PATCH_EXECUTABLE} -N utilities.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-utilities-lsb.diff
75 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src 75 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
76 RESULT_VARIABLE Failure 76 RESULT_VARIABLE Failure
77 ) 77 )
78 else() 78 else()
79 execute_process( 79 execute_process(
80 COMMAND ${PATCH_EXECUTABLE} -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff 80 COMMAND ${PATCH_EXECUTABLE} -N utilities.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff
81 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src 81 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
82 RESULT_VARIABLE Failure 82 RESULT_VARIABLE Failure
83 ) 83 )
84 endif() 84 endif()
85 85
87 message(FATAL_ERROR "Error while patching a file") 87 message(FATAL_ERROR "Error while patching a file")
88 endif() 88 endif()
89 89
90 # Patches for MinGW 90 # Patches for MinGW
91 execute_process( 91 execute_process(
92 #COMMAND ${PATCH_EXECUTABLE} -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 92 #COMMAND ${PATCH_EXECUTABLE} -N port.h -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff
93 COMMAND ${PATCH_EXECUTABLE} -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h-v2.diff 93 COMMAND ${PATCH_EXECUTABLE} -N port.h -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-h-v2.diff
94 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 94 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
95 RESULT_VARIABLE Failure 95 RESULT_VARIABLE Failure
96 ) 96 )
97 97
98 if (Failure AND FirstRun) 98 if (Failure AND FirstRun)
99 message(FATAL_ERROR "Error while patching a file") 99 message(FATAL_ERROR "Error while patching a file")
100 endif() 100 endif()
101 101
102 execute_process( 102 execute_process(
103 COMMAND ${PATCH_EXECUTABLE} -N port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff 103 COMMAND ${PATCH_EXECUTABLE} -N port.cc -i ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff
104 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 104 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
105 RESULT_VARIABLE Failure 105 RESULT_VARIABLE Failure
106 ) 106 )
107 107
108 if (Failure AND FirstRun) 108 if (Failure AND FirstRun)