Skip to content

Commit 9e76e5f

Browse files
authored
Use boost-1.55 from boost-latest ppa (#751)
* Use boost-1.55 from boost-latest ppa * squash: use correct boost package
1 parent 21624f2 commit 9e76e5f

File tree

2 files changed

+9
-11
lines changed

2 files changed

+9
-11
lines changed

.travis.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,6 @@ install:
3434
ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
3535
- export BOOST_VERSION=${BOOST_VER//./_}
3636
- export PATH=${HOME}/bin:${PATH}
37-
- travis_wait ./install-boost.sh
38-
- export BOOST_ROOT=${HOME}/${CC}-boost_${BOOST_VER//./_}
3937
- "${CXX} --version"
4038
cache:
4139
directories:
@@ -48,14 +46,16 @@ after_failure:
4846
addons:
4947
apt:
5048
sources:
51-
- ubuntu-toolchain-r-test
52-
- llvm-toolchain-precise-3.6
53-
- kalakris-cmake
49+
- ubuntu-toolchain-r-test
50+
- llvm-toolchain-precise-3.6
51+
- kalakris-cmake
52+
- boost-latest
5453
packages:
55-
- gcc-4.8
56-
- g++-4.8
57-
- clang-3.6
58-
- cmake
54+
- libboost1.55-all-dev
55+
- gcc-4.8
56+
- g++-4.8
57+
- clang-3.6
58+
- cmake
5959
notifications:
6060
slack:
6161
secure: Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=

build.sh

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,6 @@ cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \
1111
-DUri_BUILD_TESTS=$BUILD_TESTS \
1212
-DUri_BUILD_DOCS=$BUILD_DOCS \
1313
-DUri_DISABLE_LIBCXX=$Uri_DISABLE_LIBCXX \
14-
-DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \
15-
-DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \
1614
-DCMAKE_CXX_FLAGS="-std=c++11 ${CMAKE_CXX_FLAGS}" \
1715
..
1816
make -j8

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy