Correct to Travis build for the new master branch version

This commit is contained in:
John Wiegley 2018-07-19 22:42:41 -07:00
parent 5d02402291
commit 2d8e2fd039
No known key found for this signature in database
GPG key ID: C144D8F4F19FE630

View file

@ -83,7 +83,8 @@ 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 [ "${TRAVIS_BRANCH}" = "master" ]; then export BOOST_VERSION="${BOOST_VERSION_MIN}"; else export BOOST_VERSION="${BOOST_VERSION_MAX}"; fi
- BOOST_VERSION="${BOOST_VERSION_MAX}"
- 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