Mercurial > hg > orthanc

comparison Resources/CMake/GoogleLogConfiguration.cmake @ 1383:5c11c4e728eb query-retrieve

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
integration mainline->query-retrieve
author Sebastien Jodogne <s.jodogne@gmail.com>
date Fri, 29 May 2015 14:46:55 +0200
parents d0bb3dd34e2d
children 704de8c30ff5
comparison
equal deleted inserted replaced
1373:21a2929e541d 1383:5c11c4e728eb
74 COMMAND patch -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff 74 COMMAND patch -N utilities.cc ${ORTHANC_ROOT}/Resources/Patches/glog-utilities.diff
75 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src 75 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src
76 ) 76 )
77 endif() 77 endif()
78 78
79 # Patches for MinGW
79 execute_process( 80 execute_process(
80 COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 81 #COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff
82 COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h-v2.diff
81 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 83 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
82 ) 84 )
83 execute_process( 85 execute_process(
84 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
85 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 87 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
162 message(FATAL_ERROR "Please install the libgoogle-glog-dev package") 164 message(FATAL_ERROR "Please install the libgoogle-glog-dev package")
163 endif() 165 endif()
164 166
165 link_libraries(glog) 167 link_libraries(glog)
166 endif() 168 endif()
169
170
171 CHECK_INCLUDE_FILES(sec_api/string_s.h HAVE_SECURE_STRING_EXTENSIONS)
172 if (HAVE_SECURE_STRING_EXTENSIONS)
173 add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=1)
174 else()
175 add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=0)
176 endif()