aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-12-30 07:17:11 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-12-30 07:17:26 -0800
commitcdcd29f27a25334817026afaf4501bb146d66f10 (patch)
tree1999ed86e37fb8c9240dbfd9f2a12e8ea5053e25
parente00b7a672258d320789ee2efd9ed34307e68bf95 (diff)
Require cmake >= 2.8.9, use a ppa for travis.
`package_find(PythonInterp)` doesn't find python 3.2 with the cmake travis provides.
-rw-r--r--.travis.yml4
-rw-r--r--CMakeLists.txt2
2 files changed, 4 insertions, 2 deletions
diff --git a/.travis.yml b/.travis.yml
index fac2dd4..67ad397 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -3,8 +3,10 @@ compiler:
- clang
- gcc
before_install:
+ # we need a more recent cmake than travis provides (at least 2.8.9):
+ - echo "yes" | sudo add-apt-repository ppa:kalakris/cmake
- sudo apt-get update -qq
- - sudo apt-get install -qq python3 pandoc re2c valgrind
+ - sudo apt-get install -qq cmake python3 pandoc re2c valgrind
script:
- make testtarball
- PROG=`ls cmark-*.*/build/src/cmark` make leakcheck
diff --git a/CMakeLists.txt b/CMakeLists.txt
index be75c5e..1863e09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,5 +1,5 @@
project(cmark)
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 2.8.9)
if("${CMAKE_SOURCE_DIR}" STREQUAL "${CMAKE_BINARY_DIR}")
message(FATAL_ERROR "Do not build in-source.\nPlease remove CMakeCache.txt and the CMakeFiles/ directory.\nThen: mkdir build ; cd build ; cmake .. ; make")