comparison .travis.yml @ 2343:15bca89f07bf

fix
author Sebastien Jodogne <s.jodogne@gmail.com>
date Mon, 17 Jul 2017 23:30:48 +0200
parents 1abfe0959c27
children 0bf31956345c
comparison
equal deleted inserted replaced
2342:1abfe0959c27 2343:15bca89f07bf
29 before_install: 29 before_install:
30 - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && sudo apt-get install 30 - if [ $TRAVIS_OS_NAME == linux ]; then sudo apt-get update -qq && sudo apt-get install
31 -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev 31 -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev
32 libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev 32 libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev
33 libcharls-dev; fi 33 libcharls-dev; fi
34 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw32 wine; fi 34 # For DCMTK 3.6.2:
35 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install i686-w64-mingw32 wine; fi
35 36
37 # For DCMTK 3.6.0:
38 # - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == ON ]; then sudo apt-get install mingw; fi
36 39
37 before_script: 40 before_script:
38 - mkdir Build 41 - mkdir Build
39 - cd Build 42 - cd Build
40 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake 43 - if [ $TRAVIS_OS_NAME == linux -a $TRAVIS_MINGW == OFF ]; then cmake