Commit9e76e5f

authored

Use boost-1.55 from boost-latest ppa (#751)

* Use boost-1.55 from boost-latest ppa* squash: use correct boost package

1 parent21624f2 commit9e76e5fCopy full SHA for 9e76e5f

File tree

-11

lines changed

-11

lines changed

Lines changed: 9 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -34,8 +34,6 @@ install:`
`34`	`34`	ln -s `which clang++-3.6` ${HOME}/bin/clang++; fi
`35`	`35`	`-export BOOST_VERSION=${BOOST_VER//./_}`
`36`	`36`	`-export PATH=${HOME}/bin:${PATH}`
`37`		`--travis_wait ./install-boost.sh`
`38`		`--export BOOST_ROOT=${HOME}/${CC}-boost_${BOOST_VER//./_}`
`39`	`37`	`-"${CXX} --version"`
`40`	`38`	`cache:`
`41`	`39`	`directories:`
`@@ -48,14 +46,16 @@ after_failure:`
`48`	`46`	`addons:`
`49`	`47`	`apt:`
`50`	`48`	`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`
`54`	`53`	`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`
`59`	`59`	`notifications:`
`60`	`60`	`slack:`
`61`	`61`	`secure:Y7lLjqZ83+b/jaJ5+EKwvgCDeERi4bVbDn9tLp8sieTdu+ENsPI+JmLYSXZXPpe7JrItrXW6uJJXN2wG1h7au4mpVVTghd31HBzuzrqVxDphWPhp16NYzvbAgQQRBXvFVvfSdW/Kb/n2fX6xDApY0t6vNREb/GKg0GyzESb4ZjU=`

Lines changed: 0 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ cmake -DCMAKE_BUILD_TYPE=$CMAKE_BUILD_TYPE \`
`11`	`11`	`-DUri_BUILD_TESTS=$BUILD_TESTS \`
`12`	`12`	`-DUri_BUILD_DOCS=$BUILD_DOCS \`
`13`	`13`	`-DUri_DISABLE_LIBCXX=$Uri_DISABLE_LIBCXX \`
`14`		`- -DBOOST_INCLUDEDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/include" \`
`15`		`- -DBOOST_LIBRARYDIR="${HOME}/${CC}-boost_${BOOST_VERSION}/lib" \`
`16`	`14`	`-DCMAKE_CXX_FLAGS="-std=c++11${CMAKE_CXX_FLAGS}" \`
`17`	`15`	`..`
`18`	`16`	`make -j8`

Comments

(0)