diff options
| author | Jarrett Chisholm <jarrettchisholm@gmail.com> | 2017-01-15 22:57:09 -0500 |
|---|---|---|
| committer | Jarrett Chisholm <jarrettchisholm@gmail.com> | 2017-01-15 22:57:09 -0500 |
| commit | 7b1e9bf977ee2d4926853a757fe216bf011562a1 (patch) | |
| tree | faa3295a042df8bba6d21f383ee0d57101748cd3 | |
| parent | 1383b0601600ca173c3c662ba5b245aac3a44678 (diff) | |
update cmake
| -rw-r--r-- | .travis.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/.travis.yml b/.travis.yml index 8f6fb3c..028a076 100644 --- 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 60e2918..11899f9 100644 --- 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) |