From 201cdac5238fa55224c3c7487c7b2f07566cdeb7 Mon Sep 17 00:00:00 2001 From: Jonathan Beezley Date: Tue, 20 Jan 2015 05:49:14 -0500 Subject: [PATCH 1/4] Update cmake to version 3.1 on travis before building --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index b6f2952e4b..ca37d961ab 100644 --- a/.travis.yml +++ b/.travis.yml @@ -6,6 +6,7 @@ language: c++ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo add-apt-repository ppa:kubuntu-ppa/beta -y; sudo apt-get update; sudo apt-get install -y cmake; sudo apt-get install -y gfortran; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd $HOME && mkdir cmake3.1 && cd cmake3.1 && (curl "http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz" | gunzip -c | tar x) && cd cmake-*/bin && export PATH="${PWD}:${PATH}"; popd; fi script: - git submodule init From f76c9ed77e98c9dc5205b48dc3b3013f1e8bc516 Mon Sep 17 00:00:00 2001 From: Jonathan Beezley Date: Tue, 20 Jan 2015 12:58:19 -0500 Subject: [PATCH 2/4] Output cmake version on travis --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index ca37d961ab..bf33603527 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ language: c++ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo add-apt-repository ppa:kubuntu-ppa/beta -y; sudo apt-get update; sudo apt-get install -y cmake; sudo apt-get install -y gfortran; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd $HOME && mkdir cmake3.1 && cd cmake3.1 && (curl "http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz" | gunzip -c | tar x) && cd cmake-*/bin && export PATH="${PWD}:${PATH}"; popd; fi + - cmake --version script: - git submodule init From e114e06585c563e44ae219b733d6e3e6fb1c3abc Mon Sep 17 00:00:00 2001 From: Jonathan Beezley Date: Tue, 20 Jan 2015 13:03:30 -0500 Subject: [PATCH 3/4] Update cmake for osx --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index bf33603527..0c2ddecbbc 100644 --- a/.travis.yml +++ b/.travis.yml @@ -7,6 +7,7 @@ language: c++ before_install: - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo add-apt-repository ppa:kubuntu-ppa/beta -y; sudo apt-get update; sudo apt-get install -y cmake; sudo apt-get install -y gfortran; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd $HOME && mkdir cmake3.1 && cd cmake3.1 && (curl "http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz" | gunzip -c | tar x) && cd cmake-*/bin && export PATH="${PWD}:${PATH}"; popd; fi + - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew outdated cmake || brew upgrade cmake ; fi - cmake --version script: From c2d6fca7637823290a460bd69a38032879b1c9ad Mon Sep 17 00:00:00 2001 From: Aashish Chaudhary Date: Wed, 21 Jan 2015 09:33:10 -0500 Subject: [PATCH 4/4] Got rid of old way of cmake update --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index 0c2ddecbbc..4cbcaf58de 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,7 +5,7 @@ os: language: c++ before_install: - - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo add-apt-repository ppa:kubuntu-ppa/beta -y; sudo apt-get update; sudo apt-get install -y cmake; sudo apt-get install -y gfortran; fi + - if [ "$TRAVIS_OS_NAME" = "linux" ]; then sudo apt-get update -qq; sudo apt-get install -y gfortran; fi - if [ "$TRAVIS_OS_NAME" = "linux" ]; then pushd $HOME && mkdir cmake3.1 && cd cmake3.1 && (curl "http://www.cmake.org/files/v3.1/cmake-3.1.0-Linux-x86_64.tar.gz" | gunzip -c | tar x) && cd cmake-*/bin && export PATH="${PWD}:${PATH}"; popd; fi - if [ "$TRAVIS_OS_NAME" = "osx" ]; then brew update ; brew outdated cmake || brew upgrade cmake ; fi - cmake --version