summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-23 13:12:51 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-23 13:12:51 -0700
commit2365a559d0bc9e6a212e1a1a3ab919b12e3c5e90 (patch)
treeb00c2a16001da758df71fae78a9acc67ec89e7a9
parent6eca3cd659617fad71c88531843f55ac5c46ecc0 (diff)
Try to fix travis cmake.
-rw-r--r--.travis.yml14
1 files changed, 1 insertions, 13 deletions
diff --git a/.travis.yml b/.travis.yml
index f828a9b..abb33cb 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -13,6 +13,7 @@ addons:
# we need a more recent cmake than travis/linux provides (at least 2.8.9):
sources:
- kubuntu-backports
+ - kalakris-cmake
packages:
- cmake
- python3
@@ -23,19 +24,6 @@ before_install:
then
echo "Building without python3, to make sure that works."
fi
- - |
- if ( test "`uname -s`" = "Darwin" )
- then
- #cmake v2.8.12 is installed on the Mac workers now
- #brew update
- #brew install cmake
- echo
- else
- #install a newer cmake since at this time Travis only has version 2.8.7
- echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- sudo apt-get update -qq
- sudo apt-get install cmake
- fi
script:
- make