Mercurial > hg > orthanc

comparison Resources/CMake/GoogleLogConfiguration.cmake @ 1415:728c22ade2e2

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
cleaning
author Sebastien Jodogne <s.jodogne@gmail.com>
date Wed, 03 Jun 2015 21:30:25 +0200
parents 704de8c30ff5
children 23083810d543
comparison
equal deleted inserted replaced
1414:0a67a502c90f 1415:728c22ade2e2
85 execute_process( 85 execute_process(
86 COMMAND patch -N port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff 86 COMMAND patch -N port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff
87 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 87 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
88 ) 88 )
89 89
90 else(${MSVC}) 90 elseif (MSVC)
91 # https://code.google.com/p/google-glog/issues/detail?id=117 91 # https://code.google.com/p/google-glog/issues/detail?id=117
92 configure_file( 92 configure_file(
93 ${ORTHANC_ROOT}/Resources/Patches/glog-visual-studio-port.h 93 ${ORTHANC_ROOT}/Resources/Patches/glog-visual-studio-port.h
94 ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.h 94 ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.h
95 COPYONLY) 95 COPYONLY)
147 -DGLOG_NO_ABBREVIATED_SEVERITIES=1 147 -DGLOG_NO_ABBREVIATED_SEVERITIES=1
148 -DNO_FRAME_POINTER=1 148 -DNO_FRAME_POINTER=1
149 -DGOOGLE_GLOG_DLL_DECL= 149 -DGOOGLE_GLOG_DLL_DECL=
150 ) 150 )
151 151
152 if (${CMAKE_COMPILER_IS_GNUCXX}) 152 if (CMAKE_COMPILER_IS_GNUCXX)
153 # This is a patch for MinGW64 153 # This is a patch for MinGW64
154 add_definitions(-D_TIME_H__S=1) 154 add_definitions(-D_TIME_H__S=1)
155 endif() 155 endif()
156 endif() 156 endif()
157 157