# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1383563287 -3600
# Node ID e8e59e80868cdf1e18e87db568dc5d526d6d8c7d
# Parent  5425bb6f1ea5515a2f2edf3821c62885bac53ab9
note about glog-0.3.3

diff -r 5425bb6f1ea5 -r e8e59e80868c Core/Compression/ZipWriter.cpp
--- 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
 
diff -r 5425bb6f1ea5 -r e8e59e80868c NEWS
--- 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
 
 
diff -r 5425bb6f1ea5 -r e8e59e80868c Resources/CMake/GoogleLogConfiguration.cmake
--- 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
diff -r 5425bb6f1ea5 -r e8e59e80868c THANKS
--- 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