comparison .travis.yml @ 3292:bb9266715c4c

fixing travis
author Sebastien Jodogne <s.jodogne@gmail.com>
date Thu, 21 Feb 2019 21:18:32 +0100
parents d2d2a0ad833b
children 394d7eab2c9c
comparison
equal deleted inserted replaced
3291:508fa367c493 3292:bb9266715c4c
43 - cd Build 43 - cd Build
44 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake 44 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake
45 -DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" 45 -DCMAKE_BUILD_TYPE=Debug "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog"
46 -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_JSONCPP=OFF 46 -DALLOW_DOWNLOADS=ON -DUSE_SYSTEM_BOOST=OFF -DUSE_SYSTEM_CIVETWEB=OFF -DUSE_SYSTEM_JSONCPP=OFF
47 -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON 47 -DUSE_SYSTEM_GOOGLE_LOG=OFF -DUSE_SYSTEM_PUGIXML=OFF -DUSE_GOOGLE_TEST_DEBIAN_PACKAGE=ON
48 -DBOOST_LOCALE_BACKEND=icu
48 ..; fi 49 ..; fi
49 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake 50 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then cmake
50 -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON 51 -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
51 -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DUSE_DCMTK_360=ON -DUSE_LEGACY_JSONCPP=ON 52 -DCMAKE_TOOLCHAIN_FILE=Resources/MinGWToolchain.cmake -DDCMTK_STATIC_VERSION=3.6.0
53 -DUSE_LEGACY_JSONCPP=ON -DBOOST_LOCALE_BACKEND=icu -DUSE_LEGACY_LIBICU=ON
52 ..; fi 54 ..; fi
53 - if [ $TRAVIS_OS_NAME == osx ]; then cmake 55 - if [ $TRAVIS_OS_NAME == osx ]; then cmake
54 -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON 56 -DCMAKE_BUILD_TYPE=Debug -DSTATIC_BUILD=ON -DSTANDALONE_BUILD=ON -DALLOW_DOWNLOADS=ON
57 -DBOOST_LOCALE_BACKEND=icu
55 ..; fi 58 ..; fi
56 59
57 script: make && if [ $TRAVIS_MINGW == OFF ]; then ./UnitTests; fi 60 script: make && if [ $TRAVIS_MINGW == OFF ]; then ./UnitTests; fi
58 61
59 #script: cp ../README Orthanc 62 #script: cp ../README Orthanc