From 61ca1e092393cf7bd14737633352d1730321f0a7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Wiktor=20Niesiob=C4=99dzki?= Date: Sat, 27 Oct 2018 16:53:04 +0200 Subject: [PATCH] Fix builds on travis --- .gitmodules | 4 ++++ .travis.yml | 11 +++++------ contrib/pybind11 | 1 + 3 files changed, 10 insertions(+), 6 deletions(-) create mode 100644 .gitmodules create mode 160000 contrib/pybind11 diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..37efb77c --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "pybind11"] + path = contrib/pybind11 + url = https://github.com/pybind/pybind11 + branch = master diff --git a/.travis.yml b/.travis.yml index c4951dcc..15bd6457 100644 --- a/.travis.yml +++ b/.travis.yml @@ -23,17 +23,16 @@ matrix: - os: linux compiler: gcc env: USE_PYTHON_VERSION=3 - # http://docs.travis-ci.com/user/apt/ addons: apt: sources: - boost-latest + - ubuntu-toolchain-r-test packages: - - g++-4.8 - - gcc-4.8 - - libboost-python1.55-dev + - g++-6 - libboost1.55-dev + - libproj-dev - libsparsehash-dev - python-dev - python-nose @@ -55,8 +54,8 @@ install: script: - if [ "${CXX}" = 'g++' ]; then - CXX=g++-4.8; - CC=gcc-4.8; + CXX=g++-6; + CC=gcc-6; fi - if [ "$TRAVIS_OS_NAME" = 'osx' ]; then PYTHON=python${USE_PYTHON_VERSION}; diff --git a/contrib/pybind11 b/contrib/pybind11 new file mode 160000 index 00000000..9a19306f --- /dev/null +++ b/contrib/pybind11 @@ -0,0 +1 @@ +Subproject commit 9a19306fbf30642ca331d0ec88e7da54a96860f9