Merge lp:~alan-griffiths/mir/modernize-cmake into lp:mir

[Alan Griffiths]

cmake_minimum_required() and cmake_policy() should precede other commands as they affect behaviour

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4157
https://mir-jenkins.ubuntu.com/job/mir-ci/3381/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4575
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4701
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4690
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4607
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4607
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4607
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4607
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=mesa,release=zesty/4607/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4607
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4607/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3381/rebuild

review: Approve (continuous-integration)

[Brandon Schaefer (brandontschaefer)]

correct, also didnt know we had a header on that cmake file (with 2012 year :)... Annoying to have to go and update all of those.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2017-04-21 03:08:25 +0000
+++ CMakeLists.txt	2017-04-27 15:38:06 +0000
@@ -15,15 +15,15 @@
 # Authored by: Thomas Voss <[e-mail]>,
 #              Alan Griffiths <[e-mail]>
 
+cmake_minimum_required(VERSION 3.5)
+
+cmake_policy(SET CMP0015 NEW)
+cmake_policy(SET CMP0022 NEW)
+
 set(CMAKE_GCOV gcov)
 
 project(Mir)
 
-cmake_minimum_required(VERSION 2.8)
-
-cmake_policy(SET CMP0015 NEW)
-cmake_policy(SET CMP0022 NEW)
-
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)