Mercurial > hg > orthanc
comparison Resources/CMake/GoogleLogConfiguration.cmake @ 1059:f25c79497739
patch glog for visual studio >= 11.0
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Fri, 25 Jul 2014 14:08:10 +0200 |
parents | 80d4f1618b33 |
children | afaa55d42ddd 6784a119484d |
comparison
equal
deleted
inserted
replaced
1058:a098cf3bef24 | 1059:f25c79497739 |
---|---|
81 ) | 81 ) |
82 execute_process( | 82 execute_process( |
83 COMMAND patch port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff | 83 COMMAND patch port.cc ${ORTHANC_ROOT}/Resources/Patches/glog-port-cc.diff |
84 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows | 84 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows |
85 ) | 85 ) |
86 | |
87 else(${MSVC}) | |
88 # https://code.google.com/p/google-glog/issues/detail?id=117 | |
89 configure_file( | |
90 ${ORTHANC_ROOT}/Resources/Patches/glog-visual-studio-port.h | |
91 ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.h | |
92 COPYONLY) | |
93 | |
86 endif() | 94 endif() |
95 | |
87 | 96 |
88 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR | 97 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR |
89 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR | 98 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR |
90 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") | 99 ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") |
91 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") | 100 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") |