Mercurial > hg > orthanc
diff Resources/CMake/GoogleLogConfiguration.cmake @ 105:5bae1ac18ded
fixes
author | jodogne |
---|---|
date | Wed, 03 Oct 2012 17:14:52 +0200 |
parents | 7593b57dc1bf |
children | b09b0ffd9941 |
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake Wed Oct 03 16:56:14 2012 +0200 +++ b/Resources/CMake/GoogleLogConfiguration.cmake Wed Oct 03 17:14:52 2012 +0200 @@ -12,7 +12,11 @@ WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src ) execute_process( - COMMAND patch port.h ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port.diff + COMMAND patch port.h ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-h.diff + WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows + ) + execute_process( + COMMAND patch port.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-cc.diff WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows ) endif() @@ -39,8 +43,8 @@ ) set(GOOGLE_LOG_SOURCES + ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.cc ${GOOGLE_LOG_SOURCES_DIR}/src/logging.cc - ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.cc ${GOOGLE_LOG_SOURCES_DIR}/src/raw_logging.cc ${GOOGLE_LOG_SOURCES_DIR}/src/utilities.cc ${GOOGLE_LOG_SOURCES_DIR}/src/vlog_is_on.cc