Mercurial > hg > orthanc
changeset 4130:4899c3135479
fix travis
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Wed, 08 Jul 2020 09:18:03 +0200 |
| parents | 7aa92c87fdc2 |
| children | eea760f20ed2 298216fce500 |
| files | .travis.yml |
| diffstat | 1 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml Wed Jul 08 09:05:55 2020 +0200 +++ b/.travis.yml Wed Jul 08 09:18:03 2020 +0200 @@ -2,7 +2,7 @@ env: - TRAVIS_MINGW=OFF - - TRAVIS_MINGW=ON + #- TRAVIS_MINGW=ON # MinGW32 is not available anymore (2020-07-08) compiler: - gcc @@ -46,16 +46,16 @@ -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 + ../OrthancServer; 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 -DDCMTK_STATIC_VERSION=3.6.0 -DUSE_LEGACY_JSONCPP=ON -DBOOST_LOCALE_BACKEND=libiconv - ..; fi + ../OrthancServer; 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 + ../OrthancServer; fi # Old releases of MinGW are not compatible with GoogleTest 1.8.1 script: make Orthanc ServeFolders ModalityWorklists && if [ $TRAVIS_MINGW == OFF ]; then make UnitTests && ./UnitTests; fi