unity-scopes-shell

Merge lp:~pete-woods/unity-scopes-shell/cmake-extras-compatibility into lp:unity-scopes-shell

  1. cmake-extras-compatibility
  2. Merge into trunk
Proposed by Pete Woods
Status: Merged
Approved by: Michi Henning
Approved revision: 355
Merged at revision: 361
Proposed branch: lp:~pete-woods/unity-scopes-shell/cmake-extras-compatibility
Merge into: lp:unity-scopes-shell
Diff against target: 25 lines (+2/-2)
2 files modified
CMakeLists.txt (+1/-1)
debian/control.in (+1/-1)
To merge this branch: bzr merge lp:~pete-woods/unity-scopes-shell/cmake-extras-compatibility
Reviewer Review Type Date Requested Status
Michi Henning (community) Approve
unity-api-1-bot continuous-integration Needs Fixing
Review via email: mp+312715@code.launchpad.net

Commit message

Compatibility with unversioned cmake-extras modules

Description of the change

Compatibility with unversioned cmake-extras modules

To post a comment you must log in.
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:355
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/6/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1245/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1252
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1035/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1035/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1035/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1035/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1035/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1035/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/6/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
unity-api-1-bot (unity-api-1-bot) wrote :

FAILED: Continuous integration, rev:355
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/8/
Executed test runs:
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build/1253/console
    SUCCESS: https://jenkins.canonical.com/unity-api-1/job/build-0-fetch/1260
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=xenial+overlay/1043/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=amd64,release=zesty/1043/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=xenial+overlay/1043/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=armhf,release=zesty/1043/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=xenial+overlay/1043/console
    FAILURE: https://jenkins.canonical.com/unity-api-1/job/build-2-binpkg/arch=i386,release=zesty/1043/console

Click here to trigger a rebuild:
https://jenkins.canonical.com/unity-api-1/job/lp-unity-scopes-shell-ci/8/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Michi Henning (michihenning) wrote :

Looks good.

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 2016-09-08 08:38:17 +0000
3+++ CMakeLists.txt 2016-12-07 17:05:55 +0000
4@@ -14,7 +14,7 @@
5
6 string(TOLOWER "${CMAKE_BUILD_TYPE}" cmake_build_type_lower) # Build types should always be lowercase but sometimes they are not.
7
8-include(EnableCoverageReport)
9+find_package(CoverageReport)
10 #####################################################################
11 # Enable code coverage calculation with gcov/gcovr/lcov
12 # Usage:
13
14=== modified file 'debian/control.in'
15--- debian/control.in 2016-09-08 08:38:17 +0000
16+++ debian/control.in 2016-12-07 17:05:55 +0000
17@@ -2,7 +2,7 @@
18 Priority: optional
19 Section: libs
20 Build-Depends: cmake,
21- cmake-extras (>= 0.4),
22+ cmake-extras (>= 0.10),
23 debhelper (>= 9),
24 lsb-release,
25 dh-python,

Subscribers

People subscribed via source and target branches

to all changes: