reverted TravisCI build to use CMake repository and set minimum CMake…

… version to 3.0
chrisliebert · Sep 12, 2016 · 3cba59d · 3cba59d
1 parent 5a35aad
commit 3cba59d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -8,12 +8,14 @@ matrix:
     - rust: nightly
 before_install:
   - sudo apt-get -qq update
-  - sudo apt-get install -y libsqlite3-dev swig2.0 build-essential lua5.2 liblua5.2-dev cmake
+  - sudo apt-get remove -y cmake
+  - sudo apt-get install -y libsqlite3-dev swig2.0 build-essential liblua5.2-dev lua5.2
+  - sudo add-apt-repository -y ppa:george-edison55/cmake-3.x
+  - sudo apt-get -qq update
+  - sudo apt-get install -y cmake
 script:
   - export LUA_INCLUDE_DIR=/usr/include/lua5.2
   - export LUA_LIBRARY=/usr/lib/x86_64-linux-gnu/liblua5.2.a
-  - cargo build
-  - cargo test
   - cd ffi/Lua
   - cargo build --verbose
   - cargo test
diff --git a/ffi/Lua/wrapper/CMakeLists.txt b/ffi/Lua/wrapper/CMakeLists.txt
@@ -1,6 +1,6 @@
 #Copyright (C) 2016 Chris Liebert
 
-CMAKE_MINIMUM_REQUIRED(VERSION 2.8)
+CMAKE_MINIMUM_REQUIRED(VERSION 3.0)
 
 SET(QUICK3D_LIB_PATH "${CMAKE_CURRENT_SOURCE_DIR}")