comparison Resources/CMake/GoogleLogConfiguration.cmake @ 917:312d04beb0a2 mac

branch for mac os build
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 24 Feb 2014 15:10:30 +0100
parents e8e59e80868c
children ac8f68cbdbb6
comparison
equal deleted inserted replaced
729:948720c72586 917:312d04beb0a2
26 26
27 set(ac_google_namespace google) 27 set(ac_google_namespace google)
28 set(ac_google_start_namespace "namespace google {") 28 set(ac_google_start_namespace "namespace google {")
29 set(ac_google_end_namespace "}") 29 set(ac_google_end_namespace "}")
30 30
31 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 31 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
32 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
32 set(ac_cv_have_unistd_h 1) 33 set(ac_cv_have_unistd_h 1)
33 set(ac_cv_have_stdint_h 1) 34 set(ac_cv_have_stdint_h 1)
34 set(ac_cv_have_systypes_h 0) 35 set(ac_cv_have_systypes_h 0)
35 set(ac_cv_have_inttypes_h 0) 36 set(ac_cv_have_inttypes_h 0)
36 set(ac_cv_have_libgflags 0) 37 set(ac_cv_have_libgflags 0)
81 COMMAND patch port.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-cc.diff 82 COMMAND patch port.cc ${CMAKE_SOURCE_DIR}/Resources/Patches/glog-port-cc.diff
82 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows 83 WORKING_DIRECTORY ${GOOGLE_LOG_SOURCES_DIR}/src/windows
83 ) 84 )
84 endif() 85 endif()
85 86
86 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") 87 if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR
88 ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin")
87 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") 89 if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase")
88 # Install the specific configuration for LSB SDK 90 # Install the specific configuration for LSB SDK
89 configure_file( 91 configure_file(
90 ${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfigurationLSB.h 92 ${CMAKE_SOURCE_DIR}/Resources/CMake/GoogleLogConfigurationLSB.h
91 ${GOOGLE_LOG_SOURCES_DIR}/src/config.h 93 ${GOOGLE_LOG_SOURCES_DIR}/src/config.h