cmake from binaries

diff --git a/.travis.yml b/.travis.yml
index e5969764564a9cb41ed3c3625d57d9530b525838..f6b21136cf9d06e560cc4a84a0e702fed03e241e 100644 (file)
--- 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 f65046d69987902aef894a419eacfc58e71abd46..b7db2c98fc71ff3045eb2c4880877831f19ce8a5 100644 (file)
--- 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)