Mercurial > hg > orthanc
diff Resources/CMake/GoogleLogConfiguration.cmake @ 930:27d256e0b458 mac
integration mainline -> mac
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Tue, 24 Jun 2014 16:47:18 +0200 |
| parents | cecce673f22f 816dccaeb7cf |
| children | 29174c7b4631 |
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake Wed Apr 16 17:02:07 2014 +0200 +++ b/Resources/CMake/GoogleLogConfiguration.cmake Tue Jun 24 16:47:18 2014 +0200 @@ -29,7 +29,8 @@ set(ac_google_end_namespace "}") if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR - ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") set(ac_cv_have_unistd_h 1) set(ac_cv_have_stdint_h 1) set(ac_cv_have_systypes_h 0) @@ -85,7 +86,8 @@ endif() if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux" OR - ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin") + ${CMAKE_SYSTEM_NAME} STREQUAL "Darwin" OR + ${CMAKE_SYSTEM_NAME} STREQUAL "kFreeBSD") if ("${CMAKE_SYSTEM_VERSION}" STREQUAL "LinuxStandardBase") # Install the specific configuration for LSB SDK configure_file( @@ -138,13 +140,10 @@ # This is a patch for MinGW64 add_definitions(-D_TIME_H__S=1) endif() - endif() - - add_library(GoogleLog STATIC ${GOOGLE_LOG_SOURCES}) - link_libraries(GoogleLog) + set(STATIC_GOOGLE_LOG GoogleLog) else() CHECK_INCLUDE_FILE_CXX(glog/logging.h HAVE_GOOGLE_LOG_H)