diff options
| -rw-r--r-- | .travis.yml | 4 | ||||
| -rw-r--r-- | docs/installation.md | 12 |
2 files changed, 7 insertions, 9 deletions
diff --git a/.travis.yml b/.travis.yml index 5d8beb13..fd04ac24 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,12 +15,10 @@ before_install: - echo $LC_ALL - sudo apt-get -y update - sudo apt-get -y install wget git curl python-dev libprotobuf-dev libleveldb-dev libsnappy-dev libopencv-dev libboost-all-dev libhdf5-serial-dev protobuf-compiler libatlas-dev libatlas-base-dev bc - - export CFLAGS="-fPIC" - - export CXXFLAGS="-fPIC" install: - - wget https://github.com/schuhschuh/gflags/archive/master.zip -O /tmp/gflags-master.zip && pushd /tmp/ && unzip gflags-master.zip && cd gflags-master && mkdir build && cd build && cmake .. && make && sudo make install && popd - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz -O /tmp/glog-0.3.3.tar.gz && tar -C /tmp -xzvf /tmp/glog-0.3.3.tar.gz && rm /tmp/glog-0.3.3.tar.gz + - wget https://github.com/schuhschuh/gflags/archive/master.zip -O /tmp/gflags-master.zip && pushd /tmp/ && unzip gflags-master.zip && cd gflags-master && mkdir build && cd build && cmake .. && make && sudo make install && popd - cd /tmp/glog-0.3.3 && ./configure && make && sudo make install && cd - - curl http://developer.download.nvidia.com/compute/cuda/repos/ubuntu1204/x86_64/cuda-repo-ubuntu1204_6.0-37_amd64.deb -o /tmp/cuda_install.deb && sudo dpkg -i /tmp/cuda_install.deb && rm /tmp/cuda_install.deb - sudo apt-get -y update && sudo apt-get -y install cuda diff --git a/docs/installation.md b/docs/installation.md index 5f092594..a74071f8 100644 --- a/docs/installation.md +++ b/docs/installation.md @@ -73,6 +73,11 @@ And on **CentOS or RHEL**, you can install via yum using: The only exceptions being the google flags library and the google logging library, which does not exist in the Ubuntu 12.04 or CentOS/RHEL repositories. To install them, do: + # glog + wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz + tar zxvf glog-0.3.3.tar.gz + ./configure + make && make install # gflags wget https://github.com/schuhschuh/gflags/archive/master.zip unzip master.zip @@ -80,13 +85,8 @@ The only exceptions being the google flags library and the google logging librar mkdir build && cd build cmake .. make && make install - # glog - wget https://google-glog.googlecode.com/files/glog-0.3.3.tar.gz - tar zxvf glog-0.3.3.tar.gz - ./configure - make && make install -Note that if you have newer versions of Ubuntu, like 13.04 or 14.04, gflags may be available under apt-get. +Note that glog does not compile with the most recent gflags version (2.1), so before that is solved you will need to build with gflags first. Also note that if you have newer versions of Ubuntu, like 13.04 or 14.04, gflags may be available under apt-get. #### OS X |