update cmake

diff --git a/.travis.yml b/.travis.yml
index 8f6fb3c0981de59492bce38129ed93232153ff27..028a076ccc4f11806f3c016310b82c2e6f99f60c 100644 (file)
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,11 +5,13 @@ compiler:
 before_install:
   - sudo apt-add-repository -y ppa:jkeiren/ppa
   - if test $CC = gcc; then sudo add-apt-repository -y ppa:ubuntu-toolchain-r/test; fi
+  - sudo add-apt-repository -y george-edison55-precise-backports
   - sudo apt-get update -qq
   - if test $CC = gcc; then sudo apt-get install --yes --force-yes gcc-4.7 g++-4.7; fi
   - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-4.7 20; fi
   - if test $CC = gcc; then sudo update-alternatives --install /usr/bin/g++ g++ /usr/bin/g++-4.7 20; fi
   - if test $CC = gcc; then sudo update-alternatives --config gcc; fi
   - if test $CC = gcc; then sudo update-alternatives --config g++; fi
+  - sudo apt-get install --yes --force-yes cmake cmake-data
 
 script: ./scripts/travis.sh

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 60e2918d1aae151e747119dd1a9c9c7cc02a8c0b..11899f9a5bc58d614f2cadc581f2b0fcfbfa7010 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1,4 +1,4 @@
-cmake_minimum_required(VERSION 2.8)
+cmake_minimum_required(VERSION 3.1)
 set(ENTITYX_MAJOR_VERSION 1)
 set(ENTITYX_MINOR_VERSION 1)
 set(ENTITYX_PATCH_VERSION 2)