Mir

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

Proposed by Alan Griffiths on 2017-04-27
Status: Merged
Approved by: Brandon Schaefer on 2017-04-27
Approved revision: 4157
Merged at revision: 4157
Proposed branch: lp:~alan-griffiths/mir/modernize-cmake
Merge into: lp:mir
Diff against target: 23 lines (+5/-5)
1 file modified
CMakeLists.txt (+5/-5)
To merge this branch: bzr merge lp:~alan-griffiths/mir/modernize-cmake
Reviewer Review Type Date Requested Status
Brandon Schaefer (community) 2017-04-27 Approve on 2017-04-27
Mir CI Bot continuous-integration Approve on 2017-04-27
Review via email: mp+323332@code.launchpad.net

Commit message

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

To post a comment you must log in.
Mir CI Bot (mir-ci-bot) wrote :

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) wrote :

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'CMakeLists.txt'
2--- CMakeLists.txt 2017-04-21 03:08:25 +0000
3+++ CMakeLists.txt 2017-04-27 15:38:06 +0000
4@@ -15,15 +15,15 @@
5 # Authored by: Thomas Voss <thomas.voss@canonical.com>,
6 # Alan Griffiths <alan@octopull.co.uk>
7
8+cmake_minimum_required(VERSION 3.5)
9+
10+cmake_policy(SET CMP0015 NEW)
11+cmake_policy(SET CMP0022 NEW)
12+
13 set(CMAKE_GCOV gcov)
14
15 project(Mir)
16
17-cmake_minimum_required(VERSION 2.8)
18-
19-cmake_policy(SET CMP0015 NEW)
20-cmake_policy(SET CMP0022 NEW)
21-
22 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/bin)
23 set(CMAKE_LIBRARY_OUTPUT_DIRECTORY ${CMAKE_BINARY_DIR}/lib)
24

Subscribers

People subscribed via source and target branches