Merge pull request #14 from msakai/travis-protobuf-ppa

Using PPA to install Protocol Buffers on Travis-CI

.travis.yml

@@ -1,32 +1,32 @@
 dist: trusty
-sudo: false
+sudo: required
 language: cpp
 addons:
     apt:
         sources:
             - ubuntu-toolchain-r-test
             - george-edison55-precise-backports
+            - sourceline: 'ppa:maarten-fonville/protobuf'
         packages:
             - gcc-7
             - g++-7
             - cmake-data
             - cmake
             - libopencv-dev
+            - libprotobuf-dev
+            - protobuf-compiler
             - python
 cache:
     directories:
-        - $HOME/protoc
         - $HOME/mkl-dnn
 install:
     - if [ "$CXX" = "g++" ]; then export CXX="g++-7" CC="gcc-7"; fi
-    - sh .travis/install_protoc.sh
     - sh .travis/install_mkldnn.sh
     - mkdir -p data
     - pip install --user chainer
     - python retrieve_data.py
     - python gen_test_data.py
 before_script:
-    - ls -R $HOME/protoc
     - ls -R $HOME/mkl-dnn
 script:
     - mkdir build

.travis/run_cmake.sh

@@ -1,9 +1,5 @@
 cmake \
     -DENABLE_TEST=ON \
-    -DProtobuf_PROTOC_EXECUTABLE="$HOME/protoc/bin/protoc" \
-    -DProtobuf_INCLUDE_DIR="$HOME/protoc/include" \
-    -DProtobuf_LIBRARY="$HOME/protoc/lib/libprotobuf.so" \
-    -DProtobuf_PROTOC_LIBRARY="$HOME/protoc/lib/libprotoc.so" \
     -DMKLDNN_INCLUDE_DIR="$HOME/mkl-dnn/include" \
     -DMKLDNN_LIBRARY="$HOME/mkl-dnn/lib/libmkldnn.so" \
     ..