From 2fe1a84dd4782656f36c66cbc537a0a073ccaf28 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 19 Aug 2014 09:56:49 +0200 Subject: [PATCH 1/2] adding protobuf compiler to dependencies, used in branches --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 7dc4a529d..9a7028813 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,7 +7,7 @@ install: - sudo apt-add-repository -y ppa:ubuntu-toolchain-r/test - sudo add-apt-repository -y ppa:boost-latest/ppa - sudo apt-get update >/dev/null - - sudo apt-get -q install libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev + - sudo apt-get -q install protobuf-compiler libprotoc-dev libprotobuf7 libprotobuf-dev libosmpbf-dev libbz2-dev libstxxl-dev libstxxl1 libxml2-dev libzip-dev lua5.1 liblua5.1-0-dev rubygems libtbb-dev - sudo apt-get -q install g++-4.8 - sudo apt-get install libboost1.54-all-dev #luabind From c9607b99a3bcf91835f2abf24993e526229add77 Mon Sep 17 00:00:00 2001 From: Dennis Luxen Date: Tue, 19 Aug 2014 10:11:32 +0200 Subject: [PATCH 2/2] install protoc thru nuget --- appveyor.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/appveyor.yml b/appveyor.yml index d4a59f612..b5aa84853 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -23,6 +23,7 @@ platform: x64 install: # by default, all script lines are interpreted as batch + - nuget install Google.ProtocolBuffers - cd c:\projects\osrm - curl -O http://build.project-osrm.org/libs_osrm_%Configuration%.7z - 7z x libs_osrm_%Configuration%.7z | find ":"