Mercurial > hg > orthanc
diff Resources/CMake/GoogleLogConfiguration.cmake @ 658:e8e59e80868c
note about glog-0.3.3
author | Sebastien Jodogne <s.jodogne@gmail.com> |
---|---|
date | Mon, 04 Nov 2013 12:08:07 +0100 |
parents | 5425bb6f1ea5 |
children | f4f5ab513157 312d04beb0a2 |
line wrap: on
line diff
--- a/Resources/CMake/GoogleLogConfiguration.cmake Mon Nov 04 11:46:23 2013 +0100 +++ b/Resources/CMake/GoogleLogConfiguration.cmake Mon Nov 04 12:08:07 2013 +0100 @@ -1,10 +1,22 @@ if (STATIC_BUILD OR NOT USE_SYSTEM_GOOGLE_LOG) - SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.3) + SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.2) DownloadPackage( - "a6fd2c22f8996846e34c763422717c18" - "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.3.tar.gz" + "897fbff90d91ea2b6d6e78c8cea641cc" + "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.2.tar.gz" "${GOOGLE_LOG_SOURCES_DIR}") + + # Glog 0.3.3 fails to build with old versions of MinGW, such as the + # one installed on our Continuous Integration Server that runs + # Debian Squeeze. We thus stick to Glog 0.3.2 for the time being. + + #SET(GOOGLE_LOG_SOURCES_DIR ${CMAKE_BINARY_DIR}/glog-0.3.3) + #DownloadPackage( + # "a6fd2c22f8996846e34c763422717c18" + # "http://www.montefiore.ulg.ac.be/~jodogne/Orthanc/ThirdPartyDownloads/glog-0.3.3.tar.gz" + # "${GOOGLE_LOG_SOURCES_DIR}") + + set(GOOGLE_LOG_HEADERS ${GOOGLE_LOG_SOURCES_DIR}/src/glog/logging.h ${GOOGLE_LOG_SOURCES_DIR}/src/glog/raw_logging.h