# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1500355377 -7200
# Node ID a337adb29187914615028685cb345f074beb6c39
# Parent  78cb5bb7df6a5f3864c85a6a47feb67ac7e1d241
travis: fallback to dcmtk 3.6.0

diff -r 78cb5bb7df6a -r a337adb29187 .travis.yml
--- a/.travis.yml	Tue Jul 18 00:05:12 2017 +0200
+++ b/.travis.yml	Tue Jul 18 07:22:57 2017 +0200
@@ -31,11 +31,12 @@
     -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev
     libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev
     libcharls-dev; fi
-  # For DCMTK 3.6.2:
-  - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw-w64 gcc-mingw-w64-i686 g++-mingw-w64-i686 wine; fi
+  # For DCMTK 3.6.2 - Can't make it compile in static mode with MinGW32 on the
+  # Ubuntu Precise (12.04) that is used by Travis:
+  # - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw-w64 gcc-mingw-w64-i686 g++-mingw-w64-i686 wine; fi
 
   # For DCMTK 3.6.0: 
-  # - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw; fi
+  - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw; fi
 
 before_script:
   - mkdir Build
@@ -47,7 +48,7 @@
     ..; fi
   - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
-    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake
+    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON
     ..; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then cmake 
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON