Mercurial > hg > orthanc
changeset 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 | 443cced10836 |
| files | Core/Compression/ZipWriter.cpp NEWS Resources/CMake/GoogleLogConfiguration.cmake THANKS |
| diffstat | 4 files changed, 17 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/Core/Compression/ZipWriter.cpp Mon Nov 04 11:46:23 2013 +0100 +++ b/Core/Compression/ZipWriter.cpp Mon Nov 04 12:08:07 2013 +0100 @@ -29,7 +29,7 @@ * along with this program. If not, see <http://www.gnu.org/licenses/>. **/ -#ifdef _WIN32 +#ifndef NOMINMAX #define NOMINMAX #endif
--- a/NEWS Mon Nov 04 11:46:23 2013 +0100 +++ b/NEWS Mon Nov 04 12:08:07 2013 +0100 @@ -2,7 +2,6 @@ =============================== -* Switch from glog 0.3.2 to glog 0.3.3 * Fixes and improvements thanks to cppcheck
--- 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
--- a/THANKS Mon Nov 04 11:46:23 2013 +0100 +++ b/THANKS Mon Nov 04 12:08:07 2013 +0100 @@ -18,7 +18,7 @@ * Ryan Walklin (ryanwalklin@gmail.com), for Mac OS X build. * Peter Somlo (peter.somlo@gmail.com), for ClearCanvas support. * 12maksqwe@gmail.com, for fixing issue #8. -* Julien Nabet, for various suggestions for improving the source code. +* Julien Nabet, for various suggestions to improve the source code. Artwork