Mercurial > hg > orthanc

diff 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
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake	Thu May 28 12:19:26 2015 +0200
+++ b/Resources/CMake/GoogleLogConfiguration.cmake	Fri May 29 14:46:55 2015 +0200
@@ -76,8 +76,10 @@
         )
     endif()
 
+    # Patches for MinGW
     execute_process(
-      COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 
+      #COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h.diff 
+      COMMAND patch -N port.h ${ORTHANC_ROOT}/Resources/Patches/glog-port-h-v2.diff 
       WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
       )
     execute_process(
@@ -164,3 +166,11 @@
 
   link_libraries(glog)
 endif()
+
+
+CHECK_INCLUDE_FILES(sec_api/string_s.h HAVE_SECURE_STRING_EXTENSIONS)
+if (HAVE_SECURE_STRING_EXTENSIONS)
+  add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=1)
+else()
+  add_definitions(-DHAVE_SECURE_STRING_EXTENSIONS=0)
+endif()