diff options
| author | Adam Kosiorek <a.kosiorek@samsung.com> | 2014-07-29 10:40:40 +0200 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-08-17 01:07:17 -0700 |
| commit | 9f9b013813dc02c0ab86043e0b7a385c69e1b4f7 (patch) | |
| tree | e2584593b4409a849c3c3bf77f81bd38125b0eee /.travis.yml | |
| parent | f2f3b4c71210958125d4945442641e0305fbeba9 (diff) | |
| download | caffe-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.tar.gz caffe-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.tar.bz2 caffe-9f9b013813dc02c0ab86043e0b7a385c69e1b4f7.zip | |
added gflags + bugfixes + rebase on bvlc/caffe
* added gflags requirement in CMake
* fixed a bug that linked some tests into caffe lib
* renamed tools/caffe due to conflicting target names with caffe lib
* rebased onto bvlc/caffe
Diffstat (limited to '.travis.yml')
| -rw-r--r-- | .travis.yml | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/.travis.yml b/.travis.yml index c94d9cde..fd82c99f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,13 +18,8 @@ before_install: install: # CMake 2.8.12 -<<<<<<< HEAD - - wget http://www.cmake.org/files/v2.8/cmake-2.8.12.tar.gz -O /tmp/cmake.tar.gz && tar -C /tmp -xvf /tmp/cmake.tar.gz && rm /tmp/cmake.tar.gz - - cd /tmp/cmake-2.8.12 && ./bootstrap --prefix=/usr && make -j4 && sudo make install -j4 && cd - #&& rm -r /tmp/cmake-2.8.12 -======= - - wget http://www.cmake.org/files/v2.8/cmake-2.8.12.2-Linux-i386.tar.gz -O /tmp/cmake.tar.gz && tar -C /tmp -xvf /tmp/cmake.tar.gz && rm /tmp/cmake.tar.gz + - wget http://www.cmake.org/files/v2.8/cmake-2.8.12.2-Linux-i386.tar.gz -O /tmp/cmake.tar.gz && tar -C /tmp -xvf /tmp/cmake.tar.gz && rm /tmp/cmake.tar.gz - cd /tmp/cmake-2.8.12.2-Linux-i386 && sudo cp * /usr/ -r && cd - && rm -r /tmp/cmake-2.8.12.2-Linux-i386 ->>>>>>> cmake from binaries # - 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 - cd /tmp/glog-0.3.3 && ./configure && make -j4 && sudo make install -j4 && cd - @@ -63,7 +58,7 @@ script: ## Cleaning - cd .. - rm -r build - + # Make build ## CPU-GPU: build only. - export CPU_ONLY=0 |