Mir

Merge lp:~vanvugt/mir/Werror-for-C into lp:~mir-team/mir/trunk

  1. Werror-for-C
  2. Merge into trunk
Proposed by Daniel van Vugt
Status: Merged
Approved by: Alan Griffiths
Approved revision: no longer in the source branch.
Merged at revision: 497
Proposed branch: lp:~vanvugt/mir/Werror-for-C
Merge into: lp:~mir-team/mir/trunk
Prerequisite: lp:~vanvugt/mir/reduce-scope-of-3p-sources
Diff against target: 34 lines (+6/-2)
3 files modified
3rd_party/CMakeLists.txt (+4/-0)
CMakeLists.txt (+1/-1)
tests/client-language/CMakeLists.txt (+1/-1)
To merge this branch: bzr merge lp:~vanvugt/mir/Werror-for-C
Reviewer Review Type Date Requested Status
Alan Griffiths Approve
Alexandros Frantzis (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+153075@code.launchpad.net

Commit message

Treat warnings as errors in C too; not just C++.

Only one exception: 3rd_party. We don't plan on fixing 3rd party code.

Description of the change

Also removed -Werror from tests/client-language because that is redundant now that -Werror is applied globally.

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

PASSED: Continuous integration, rev:496
http://jenkins.qa.ubuntu.com/job/mir-ci/68/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/mir-quantal-amd64-ci/69//console

Click here to trigger a rebuild:
http://jenkins.qa.ubuntu.com/job/mir-ci/68//rebuild/?

review: Approve (continuous-integration)
Revision history for this message
Alexandros Frantzis (afrantzis) wrote :

Looks good.

review: Approve
Revision history for this message
Alan Griffiths (alan-griffiths) wrote :

LGTM

review: Approve
Revision history for this message
Daniel van Vugt (vanvugt) wrote :

You'll need to approve the prereq branch before this one, or it will fail to merge.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file '3rd_party/CMakeLists.txt'
2--- 3rd_party/CMakeLists.txt 2013-03-13 08:06:26 +0000
3+++ 3rd_party/CMakeLists.txt 2013-03-13 08:06:26 +0000
4@@ -1,3 +1,7 @@
5+
6+# Warnings in 3rd party code are not to be considered errors. :(
7+string (REPLACE " -Werror " " " CMAKE_C_FLAGS ${CMAKE_C_FLAGS})
8+
9 list(
10 APPEND MIR_3RD_PARTY_INCLUDE_DIRECTORIES
11 ${CMAKE_CURRENT_SOURCE_DIR}/libancillary
12
13=== modified file 'CMakeLists.txt'
14--- CMakeLists.txt 2013-03-13 08:06:26 +0000
15+++ CMakeLists.txt 2013-03-13 08:06:26 +0000
16@@ -47,7 +47,7 @@
17 include (cmake/Doxygen.cmake)
18 include (cmake/PrePush.cmake)
19
20-set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
21+set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror -Wall -pedantic -Wextra -fPIC")
22 set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -std=c++0x -Werror -Wall -fno-strict-aliasing -pedantic -Wextra -fPIC")
23
24 #####################################################################
25
26=== modified file 'tests/client-language/CMakeLists.txt'
27--- tests/client-language/CMakeLists.txt 2013-03-08 07:20:43 +0000
28+++ tests/client-language/CMakeLists.txt 2013-03-13 08:06:26 +0000
29@@ -1,4 +1,4 @@
30-set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89 -Werror -Wall -Wextra" )
31+set (CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -std=c89")
32
33 add_executable(client-language-test-c89
34 c89.c

Subscribers

People subscribed via source and target branches