# HG changeset patch
# User Sebastien Jodogne <s.jodogne@gmail.com>
# Date 1420721566 -3600
# Node ID 0786cbd3ade3261d9edcc8ea1f2b68993a216831
# Parent  e47cc1580678b4635c48bd6b4cd613da53524c27
fix

diff -r e47cc1580678 -r 0786cbd3ade3 .travis.yml
--- 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
diff -r e47cc1580678 -r 0786cbd3ade3 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 \