Mir

Merge lp:~mir-team/mir/fix-1387501 into lp:mir

  1. fix-1387501
  2. Merge into development-branch
Proposed by Alberto Aguirre
Status: Merged
Approved by: Alberto Aguirre
Approved revision: no longer in the source branch.
Merged at revision: 2018
Proposed branch: lp:~mir-team/mir/fix-1387501
Merge into: lp:mir
Diff against target: 24 lines (+5/-1)
2 files modified
benchmarks/CMakeLists.txt (+1/-1)
cmake/ABICheck.cmake (+4/-0)
To merge this branch: bzr merge lp:~mir-team/mir/fix-1387501
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Cemil Azizoglu (community) Approve
Alberto Aguirre Pending
Review via email: mp+240287@code.launchpad.net

This proposal supersedes a proposal from 2014-10-30.

Commit message

Fix CMake 3.0 warnings new in vivid (LP: #1387501)

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote : Posted in a previous version of this proposal

FAILED: Continuous integration, rev:2012
http://jenkins.qa.ubuntu.com/job/mir-ci/1952/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2305/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2315/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2240/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/295/console
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1177/console

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1952/rebuild

review: Needs Fixing (continuous-integration)
Revision history for this message
Alberto Aguirre (albaguirre) wrote : Posted in a previous version of this proposal

18 + cmake_policy(SET CMP0026 OLD)

if (NOT ${CMAKE_MAJOR_VERSION} LESS 3)
    cmake_policy(SET CMP0026 OLD)
endif()

review: Needs Fixing
Revision history for this message
Cemil Azizoglu (cemil-azizoglu) wrote :

Makes sense.

review: Approve
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

PASSED: Continuous integration, rev:2014
http://jenkins.qa.ubuntu.com/job/mir-ci/1962/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-utopic-i386-build/2319
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-utopic-amd64-build/2329
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-utopic-touch/2254
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/307
        deb: http://jenkins.qa.ubuntu.com/job/mir-utopic-amd64-ci/307/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1191
        deb: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-builder-utopic-armhf/1191/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-mediumtests-runner-mako/3228
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/15283

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/mir-ci/1962/rebuild

review: Approve (continuous-integration)
Revision history for this message
PS Jenkins bot (ps-jenkins) :
review: Approve (continuous-integration)

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'benchmarks/CMakeLists.txt'
2--- benchmarks/CMakeLists.txt 2014-10-22 14:08:51 +0000
3+++ benchmarks/CMakeLists.txt 2014-10-31 15:34:31 +0000
4@@ -11,4 +11,4 @@
5 add_subdirectory(memory)
6 add_subdirectory(frame-uniformity)
7
8-add_dependencies(benchmarks cpu_benchmarks memory_benchmarks frame_uniformity)
9+add_dependencies(benchmarks cpu_benchmarks memory_benchmarks frame_uniformity_test_client)
10
11=== modified file 'cmake/ABICheck.cmake'
12--- cmake/ABICheck.cmake 2014-10-06 03:02:44 +0000
13+++ cmake/ABICheck.cmake 2014-10-31 15:34:31 +0000
14@@ -39,6 +39,10 @@
15 ${private_headers}"
16 )
17
18+ if (NOT ${CMAKE_MAJOR_VERSION} LESS 3)
19+ cmake_policy(SET CMP0026 OLD)
20+ endif()
21+ # TODO: Deprecate use of "LOCATION" (CMP0026) ...
22 if ("${ABI_DUMP_PREBUILT_LIBDIR}" STREQUAL "")
23 get_property(LIB_DESC_LIBS TARGET ${libname} PROPERTY LOCATION)
24 else()

Subscribers

People subscribed via source and target branches