summaryrefslogtreecommitdiff
path: root/.travis.yml
diff options
context:
space:
mode:
authorAdam Kosiorek <a.kosiorek@samsung.com>2014-07-24 11:44:05 (GMT)
committerJeff Donahue <jeff.donahue@gmail.com>2014-08-17 08:07:16 (GMT)
commit68ae1ab7f2f486d82c9d683d9e1db21ecd329505 (patch)
tree56fb20521a09c1bcb779796ee5c93930ac2080e7 /.travis.yml
parenta2a4d636c9cb4a8f071b1703acfe0aeb6f8d7771 (diff)
downloadcaffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.zip
caffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.tar.gz
caffeonacl-68ae1ab7f2f486d82c9d683d9e1db21ecd329505.tar.bz2
cmake from binaries
Diffstat (limited to '.travis.yml')
-rw-r--r--.travis.yml5
1 files changed, 5 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index e596976..f6b2113 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 -