Mercurial > hg > orthanc
changeset 1257:0786cbd3ade3
fix
| author | Sebastien Jodogne <s.jodogne@gmail.com> |
|---|---|
| date | Thu, 08 Jan 2015 13:52:46 +0100 |
| parents | e47cc1580678 |
| children | 2a3b0394fc2b |
| files | .travis.yml Resources/TravisUbuntu-12.04.sh |
| diffstat | 2 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.travis.yml Thu Jan 08 13:47:48 2015 +0100 +++ b/.travis.yml Thu Jan 08 13:52:46 2015 +0100 @@ -8,7 +8,8 @@ before_install: - sudo apt-get update -qq - - sudo apt-get install -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libboost-all-dev libwrap0-dev libcharls-dev + - sudo apt-get install -qq build-essential unzip cmake mercurial uuid-dev libcurl4-openssl-dev liblua5.1-0-dev libgtest-dev libpng-dev libsqlite3-dev libssl-dev zlib1g-dev libdcmtk2-dev libwrap0-dev libcharls-dev -# Travis-CI uses Ubuntu 12.04 virtual machines +# Travis-CI uses Ubuntu 12.04 virtual machines, with Boost 1.46.0 +# (whereas Orthanc expects Boost >= 1.48.0) script: ./Resources/TravisUbuntu-12.04.sh
--- a/Resources/TravisUbuntu-12.04.sh Thu Jan 08 13:47:48 2015 +0100 +++ b/Resources/TravisUbuntu-12.04.sh Thu Jan 08 13:52:46 2015 +0100 @@ -1,5 +1,4 @@ -#! /bin/sh - +#!/bin/sh set -e @@ -9,6 +8,7 @@ cmake \ "-DDCMTK_LIBRARIES=CharLS;dcmjpls;wrap;oflog" \ -DALLOW_DOWNLOADS=ON \ + -DUSE_SYSTEM_BOOST=OFF \ -DUSE_SYSTEM_MONGOOSE=OFF \ -DUSE_SYSTEM_JSONCPP=OFF \ -DUSE_SYSTEM_GOOGLE_LOG=OFF \