summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2016-06-23 10:21:19 -0700
committerJohn MacFarlane <jgm@berkeley.edu>2016-06-23 10:21:19 -0700
commit78c60ec7977c35c442f537d72cf4e96375c069f1 (patch)
tree24bc96873cc9850829f0adc578430e133a1d1d8b
parentdbfe3fae72eef02f0689f7e5962ca04a8d395c21 (diff)
Travis: install more recent cmake on linux.
-rw-r--r--.travis.yml14
1 files changed, 14 insertions, 0 deletions
diff --git a/.travis.yml b/.travis.yml
index 059a53d..f828a9b 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -23,6 +23,20 @@ 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
- make test