Mercurial > hg > orthanc
comparison Resources/CMake/GoogleLogConfiguration.cmake @ 105:5bae1ac18ded
fixes
author | jodogne |
---|---|
date | Wed, 03 Oct 2012 17:14:52 +0200 |
parents | 7593b57dc1bf |
children | b09b0ffd9941 |
comparison
equal
deleted
inserted
replaced
104:bb50d0eb4493 | 105:5bae1ac18ded |
---|---|
10 execute_process( | 10 execute_process( |
11 COMMAND patch utilities.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-utilities.diff | 11 COMMAND patch utilities.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-utilities.diff |
12 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src | 12 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src |
13 ) | 13 ) |
14 execute_process( | 14 execute_process( |
15 COMMAND patch port.h ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port.diff | 15 COMMAND patch port.h ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-h.diff |
16 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows | |
17 ) | |
18 execute_process( | |
19 COMMAND patch port.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-cc.diff | |
16 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows | 20 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows |
17 ) | 21 ) |
18 endif() | 22 endif() |
19 | 23 |
20 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | 24 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
37 include_directories( | 41 include_directories( |
38 ${GOOGLE_LOG_SOURCES_DIR}/src/windows | 42 ${GOOGLE_LOG_SOURCES_DIR}/src/windows |
39 ) | 43 ) |
40 | 44 |
41 set(GOOGLE_LOG_SOURCES | 45 set(GOOGLE_LOG_SOURCES |
46 ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.cc | |
42 ${GOOGLE_LOG_SOURCES_DIR}/src/logging.cc | 47 ${GOOGLE_LOG_SOURCES_DIR}/src/logging.cc |
43 ${GOOGLE_LOG_SOURCES_DIR}/src/windows/port.cc | |
44 ${GOOGLE_LOG_SOURCES_DIR}/src/raw_logging.cc | 48 ${GOOGLE_LOG_SOURCES_DIR}/src/raw_logging.cc |
45 ${GOOGLE_LOG_SOURCES_DIR}/src/utilities.cc | 49 ${GOOGLE_LOG_SOURCES_DIR}/src/utilities.cc |
46 ${GOOGLE_LOG_SOURCES_DIR}/src/vlog_is_on.cc | 50 ${GOOGLE_LOG_SOURCES_DIR}/src/vlog_is_on.cc |
47 ) | 51 ) |
48 | 52 |