Mercurial > hg > orthanc
changeset 131:8ef8ce9fb6b3
fix of static google log
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Mon, 08 Oct 2012 10:32:12 +0200 |
| parents | b09b0ffd9941 |
| children | 5321f3609639 |
| files | Resources/CMake/GoogleLogConfiguration.cmake |
| diffstat | 1 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake Sat Oct 06 16:47:58 2012 +0200 +++ b/Resources/CMake/GoogleLogConfiguration.cmake Mon Oct 08 10:32:12 2012 +0200 @@ -1,4 +1,4 @@ -if (NOT USE_DYNAMIC_GOOGLE_LOG) +if (${STATIC_BUILD} OR NOT ${USE_DYNAMIC_GOOGLE_LOG}) SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2) DownloadPackage("http://google-glog.googlecode.com/files/glog-0.3.2.tar.gz" "${GOOGLE_LOG_SOURCES_DIR}" "" "") @@ -9,6 +9,10 @@ ${GOOGLE_LOG_SOURCES_DIR}/src/glog/vlog_is_on.h ) + set(ac_google_namespace google) + set(ac_google_start_namespace "namespace google {") + set(ac_google_end_namespace "}") + if (${CMAKE_SYSTEM_NAME} STREQUAL "Linux") set(ac_cv_have_unistd_h 1) set(ac_cv_have_stdint_h 1) @@ -18,12 +22,19 @@ set(ac_cv_have_uint16_t 1) set(ac_cv_have_u_int16_t 0) set(ac_cv_have___uint16 0) - set(ac_cv_cxx_using_operator HAVE_USING_OPERATOR) - set(ac_cv_have___builtin_expect HAVE___BUILTIN_EXPECT) - set(ac_google_start_namespace _START_GOOGLE_NAMESPACE_) - set(ac_google_end_namespace _END_GOOGLE_NAMESPACE_) + set(ac_cv_cxx_using_operator 1) + set(ac_cv_have___builtin_expect 1) else() - # TODO + set(ac_cv_have_unistd_h 0) + set(ac_cv_have_stdint_h 0) + set(ac_cv_have_systypes_h 0) + set(ac_cv_have_inttypes_h 0) + set(ac_cv_have_libgflags 0) + set(ac_cv_have_uint16_t 0) + set(ac_cv_have_u_int16_t 0) + set(ac_cv_have___uint16 1) + set(ac_cv_cxx_using_operator 1) + set(ac_cv_have___builtin_expect 1) endif() foreach (f ${GOOGLE_LOG_HEADERS})