Skip to content

Commit 5b82c3b

Browse files
committed
update Travis CI settings to use more modern compilers, put back Boost system library: test programs link against it
1 parent 65b948e commit 5b82c3b

File tree

3 files changed

+12
-11
lines changed

3 files changed

+12
-11
lines changed

.travis.yml

+11
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,8 @@
1+
sudo: required
2+
dist: trusty
3+
cache:
4+
apt: true
5+
16
language: cpp
27

38
os:
@@ -17,6 +22,12 @@ matrix:
1722
- os: osx
1823
compiler: gcc
1924

25+
addons:
26+
apt:
27+
packages:
28+
- libflann-dev
29+
- libboost-all-dev
30+
2031
install:
2132
# Install dependencies for FCL
2233
- if [ "$TRAVIS_OS_NAME" = "linux" ]; then 'ci/install_linux.sh' ; fi

CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ endif()
104104
# endif()
105105

106106

107-
find_package(Boost COMPONENTS date_time filesystem unit_test_framework REQUIRED)
107+
find_package(Boost COMPONENTS date_time filesystem system unit_test_framework REQUIRED)
108108
include_directories(${Boost_INCLUDE_DIR})
109109

110110
if(MSVC)

ci/install_linux.sh

-10
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,8 @@
11
sudo add-apt-repository --yes ppa:libccd-debs/ppa
22
sudo apt-get -qq update
33

4-
########################
5-
# Mendatory dependencies
6-
########################
7-
sudo apt-get -qq --yes --force-yes install cmake
8-
sudo apt-get -qq --yes --force-yes install libboost-all-dev
94
sudo apt-get -qq --yes --force-yes install libccd-dev
105

11-
########################
12-
# Optional dependencies
13-
########################
14-
sudo apt-get -qq --yes --force-yes install libflann-dev
15-
166
# Octomap
177
git clone https://github.com/OctoMap/octomap
188
cd octomap

0 commit comments

Comments
 (0)