summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--.travis.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index abfa903b..06ead752 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -18,8 +18,11 @@ cache:
env:
global:
- # Boost version to use.
- - BOOST_VERSION="1.58.0"
+ # Boost version to use:
+ # _MIN is used when building the master branch
+ # _MAX is used when building any other branch
+ - BOOST_VERSION_MIN="1.49.0"
+ - BOOST_VERSION_MAX="1.58.0"
# List of required boost libraries to build
- BOOST_LIBS="date_time,filesystem,iostreams,python,regex,system,test"
# List of required Homebrew formulae to install
@@ -65,6 +68,7 @@ addons:
#- libboost-serialization1.55-dev
before_install:
+ - if [ "${TRAVIS_BRANCH}" = "master" ]; then export BOOST_VERSION="${BOOST_VERSION_MIN}"; else export BOOST_VERSION="${BOOST_VERSION_MAX}"; fi
- if [ -n "${BOOST_VERSION}" ]; then export BOOST_ROOT="${TRAVIS_BUILD_DIR}/../boost-trunk"; export CMAKE_MODULE_PATH="${BOOST_ROOT}"; fi
- if [ "${CXX}" = "g++" ]; then export CXX="$(which g++-4.8)"; export CC="$(which gcc-4.8)"; fi
- if [ "${TRAVIS_OS_NAME}" = "osx" ]; then export DYLD_LIBRARY_PATH="${BOOST_ROOT}/lib"; fi