# HG changeset patch # User Sebastien Jodogne # Date 1550780312 -3600 # Node ID bb9266715c4ca1ef444cdd6fbef264ef4926aecd # Parent 508fa367c4933f7587c09656e8ba32ebe7d64dd4 fixing travis diff -r 508fa367c493 -r bb9266715c4c .travis.yml --- 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