Mercurial > hg > orthanc

changeset 3292:bb9266715c4c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixing travis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 21:18:32 +0100
parents 508fa367c493
children 394d7eab2c9c
files .travis.yml
diffstat 1 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.travis.yml	Thu Feb 21 20:53:48 2019 +0100
+++ b/.travis.yml	Thu Feb 21 21:18:32 2019 +0100
@@ -45,13 +45,16 @@
     -DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog"
     -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_JSONCPP=OFF
     -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON
+    -DBOOST_LOCALE_BACKEND=icu
     ..; 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 -DUSE_DCMTK_360=ON -DUSE_LEGACY_JSONCPP=ON
+    -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DDCMTK_STATIC_VERSION=3.6.0
+    -DUSE_LEGACY_JSONCPP=ON -DBOOST_LOCALE_BACKEND=icu -DUSE_LEGACY_LIBICU=ON
     ..; fi
   - if [ $TRAVIS_OS_NAME == osx ]; then cmake 
     -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
+    -DBOOST_LOCALE_BACKEND=icu
     ..; fi
 
 script: make && if [ $TRAVIS_MINGW == OFF ]; then ./UnitTests; fi