Merge pull request #1022 from leapmotion/upd-cmake-req

Update minimum CMake requirement
leapmotion · Aug 4, 2017 · dccea50 · dccea50
2 parents 5f4a12a + 48c1f98
commit dccea50
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -7,23 +7,22 @@ matrix:
     env:
     - _CC: gcc-4.8
     - _CXX: g++-4.8
-    - CMAKE_URL=http://cmake.org/files/v3.4/cmake-3.4.0-Linux-i386.tar.gz
-    - CMAKE_DIRNAME=cmake-3.4.0-Linux-i386
+    - CMAKE_URL=http://cmake.org/files/v3.8/cmake-3.8.2-Linux-x86_64.tar.gz
+    - CMAKE_DIRNAME=cmake-3.8.2-Linux-x86_64
     addons:
       apt:
         sources:
           - ubuntu-toolchain-r-test
         packages:
           - gcc-4.8
           - g++-4.8
-          - libc6-i386
   - os: osx
     osx_image: xcode8
     env:
     - _CC: clang
     - _CXX: clang++
-    - CMAKE_URL=http://cmake.org/files/v3.4/cmake-3.4.0-Darwin-x86_64.tar.gz
-    - CMAKE_DIRNAME=cmake-3.4.0-Darwin-x86_64/CMake.app/Contents
+    - CMAKE_URL=http://cmake.org/files/v3.8/cmake-3.8.2-Darwin-x86_64.tar.gz
+    - CMAKE_DIRNAME=cmake-3.8.2-Darwin-x86_64/CMake.app/Contents
 
 before_install:
   # Enforce whitespace guidelines

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 3.4)
+cmake_minimum_required(VERSION 3.8)
 include(version.cmake)
 include("standard/Standard.cmake")