diff --git a/.travis.yml b/.travis.yml index 87f28a941..c0acb80a6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -4,12 +4,12 @@ compiler: # - clang # Make sure CMake is installed install: - - sudo apt-get update >/dev/null - - sudo apt-get -q install libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev libboost1.46-all-dev lua5.1 liblua5.1-0-dev libluabind-dev rubygems - - curl -s https://gist.githubusercontent.com/DennisOSRM/803a64a9178ec375069f/raw/ | sudo bash - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test - - sudo apt-get update - - sudo apt-get -q install g++-4.7 + - sudo add-apt-repository -y ppa:irie/boost + - sudo apt-get update >/dev/null + - sudo apt-get -q install libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev libboost-dev lua5.1 liblua5.1-0-dev libluabind-dev rubygems + - curl -s https://gist.githubusercontent.com/DennisOSRM/803a64a9178ec375069f/raw/ | sudo bash + - sudo apt-get -q install g++-4.7 before_script: - rvm use 1.9.3 - gem install bundler diff --git a/CMakeLists.txt b/CMakeLists.txt index 9365696f5..4dc5f69b0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -154,10 +154,10 @@ if(UNIX AND NOT APPLE) endif() #Check Boost -set(BOOST_MIN_VERSION "1.46.0") +set(BOOST_MIN_VERSION "1.49.0") find_package(Boost ${BOOST_MIN_VERSION} COMPONENTS ${BOOST_COMPONENTS} REQUIRED) if(NOT Boost_FOUND) - message(FATAL_ERROR "Fatal error: Boost (version >= 1.46.0) required.\n") + message(FATAL_ERROR "Fatal error: Boost (version >= 1.49.0) required.\n") endif() include_directories(${Boost_INCLUDE_DIRS})