Skip to content

Commit 61ca1e0

Browse files
committed
Fix builds on travis
1 parent 1b87e67 commit 61ca1e0

File tree

3 files changed

+10
-6
lines changed

3 files changed

+10
-6
lines changed

.gitmodules

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
[submodule "pybind11"]
2+
path = contrib/pybind11
3+
url = https://github.com/pybind/pybind11
4+
branch = master

.travis.yml

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,16 @@ matrix:
2323
- os: linux
2424
compiler: gcc
2525
env: USE_PYTHON_VERSION=3
26-
2726
# http://docs.travis-ci.com/user/apt/
2827
addons:
2928
apt:
3029
sources:
3130
- boost-latest
31+
- ubuntu-toolchain-r-test
3232
packages:
33-
- g++-4.8
34-
- gcc-4.8
35-
- libboost-python1.55-dev
33+
- g++-6
3634
- libboost1.55-dev
35+
- libproj-dev
3736
- libsparsehash-dev
3837
- python-dev
3938
- python-nose
@@ -55,8 +54,8 @@ install:
5554

5655
script:
5756
- if [ "${CXX}" = 'g++' ]; then
58-
CXX=g++-4.8;
59-
CC=gcc-4.8;
57+
CXX=g++-6;
58+
CC=gcc-6;
6059
fi
6160
- if [ "$TRAVIS_OS_NAME" = 'osx' ]; then
6261
PYTHON=python${USE_PYTHON_VERSION};

contrib/pybind11

Submodule pybind11 added at 9a19306

0 commit comments

Comments
 (0)