Mir

Merge lp:~raof/mir/fix-g++-4.8-build into lp:~mir-team/mir/trunk

  1. fix-g++-4.8-build
  2. Merge into trunk
Proposed by Chris Halse Rogers
Status: Merged
Approved by: Robert Carr
Approved revision: no longer in the source branch.
Merged at revision: 683
Proposed branch: lp:~raof/mir/fix-g++-4.8-build
Merge into: lp:~mir-team/mir/trunk
Diff against target: 15 lines (+4/-1)
1 file modified
tests/CMakeLists.txt (+4/-1)
To merge this branch: bzr merge lp:~raof/mir/fix-g++-4.8-build
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Robert Carr (community) Approve
Review via email: mp+163635@code.launchpad.net

Commit message

Fix build with g++ 4.8

Description of the change

Fix the build with g++ 4.8

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

FAILED: Continuous integration, rev:682
http://jenkins.qa.ubuntu.com/job/mir-ci/577/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/679
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/562/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/61
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/61/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-vm-ci-build/./distribution=precise,flavor=amd64/309

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

review: Needs Fixing (continuous-integration)
Revision history for this message
Robert Carr (robertcarr) wrote :

Ok!

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

FAILED: Continuous integration, rev:683
http://jenkins.qa.ubuntu.com/job/mir-ci/578/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-android-raring-i386-build/680
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-clang-raring-amd64-build/563
    FAILURE: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/62/console
        deb: http://jenkins.qa.ubuntu.com/job/mir-raring-amd64-ci/62/artifact/work/output/*zip*/output.zip

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

review: Needs Fixing (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 'tests/CMakeLists.txt'
2--- tests/CMakeLists.txt 2013-05-10 00:39:29 +0000
3+++ tests/CMakeLists.txt 2013-05-14 05:47:28 +0000
4@@ -14,7 +14,10 @@
5 # Avoid clang complaints about poor quality gmock/gtest/cucumber headers
6 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=null-dereference")
7 set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=overloaded-virtual")
8-endif ()
9+else ()
10+ # GCC 4.8 dislikes the gmock headers…
11+ set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=unused-local-typedefs")
12+endif()
13
14 include_directories(${PROJECT_SOURCE_DIR}/include/server)
15 include_directories(${PROJECT_SOURCE_DIR}/include/client)

Subscribers

People subscribed via source and target branches