diff options
| author | Adam Kosiorek <a.kosiorek@samsung.com> | 2014-07-24 13:44:05 +0200 |
|---|---|---|
| committer | Jeff Donahue <jeff.donahue@gmail.com> | 2014-08-17 01:07:16 -0700 |
| commit | 68ae1ab7f2f486d82c9d683d9e1db21ecd329505 (patch) | |
| tree | 56fb20521a09c1bcb779796ee5c93930ac2080e7 | |
| parent | a2a4d636c9cb4a8f071b1703acfe0aeb6f8d7771 (diff) | |
| download | caffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.tar.gz caffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.tar.bz2 caffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.zip | |
cmake from binaries
| -rw-r--r-- | .travis.yml | 5 | ||||
| -rw-r--r-- | CMakeLists.txt | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml index e5969764..f6b21136 100644 --- a/.travis.yml +++ b/.travis.yml @@ -18,8 +18,13 @@ 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 + - 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 - diff --git a/CMakeLists.txt b/CMakeLists.txt index f65046d6..b7db2c98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,6 +3,7 @@ project( Caffe ) ### Build Options ########################################################################## +option(CPU_ONLY "Build Caffe without GPU support" OFF) option(BUILD_PYTHON "Build Python wrapper" OFF) option(BUILD_MATLAB "Build Matlab wrapper" OFF) option(BUILD_EXAMPLES "Build examples" ON) |