Mercurial > hg > orthanc
comparison Resources/CMake/GoogleLogConfiguration.cmake @ 569:701d748cf327 laaw
fixes
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Wed, 25 Sep 2013 13:18:19 +0200 |
parents | ded40a9e8cc8 |
children | d775a3cb5a06 |
comparison
equal
deleted
inserted
replaced
568:3f27814104f7 | 569:701d748cf327 |
---|---|
47 include_directories( | 47 include_directories( |
48 ${GOOGLE_LOG_SOURCES_DIR}/src | 48 ${GOOGLE_LOG_SOURCES_DIR}/src |
49 ) | 49 ) |
50 | 50 |
51 if (CMAKE_COMPILER_IS_GNUCXX) | 51 if (CMAKE_COMPILER_IS_GNUCXX) |
52 if (${CMAKE_SYSTEM_VERSION} STREQUAL "LinuxStandardBase") | 52 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") |
53 execute_process( | 53 execute_process( |
54 COMMAND patch utilities.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-utilities-lsb.diff | 54 COMMAND patch utilities.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-utilities-lsb.diff |
55 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src | 55 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src |
56 ) | 56 ) |
57 else() | 57 else() |
70 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows | 70 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows |
71 ) | 71 ) |
72 endif() | 72 endif() |
73 | 73 |
74 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") | 74 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") |
75 if (${CMAKE_SYSTEM_VERSION} STREQUAL "LinuxStandardBase") | 75 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") |
76 # Install the specific configuration for LSB SDK | 76 # Install the specific configuration for LSB SDK |
77 configure_file( | 77 configure_file( |
78 ${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfigurationLSB.h | 78 ${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfigurationLSB.h |
79 ${GOOGLE_LOG_SOURCES_DIR}/src/config.h | 79 ${GOOGLE_LOG_SOURCES_DIR}/src/config.h |
80 COPYONLY) | 80 COPYONLY) |