Merge lp:~sil2100/unity/fix_ftbfs_arm_unused_typedefs into lp:unity

[Łukasz Zemczak]

Add a flag for -Wno-error=unused-local-typedefs, since this causes a FTBFS on ARM

- Problem:

Due to the recent switch to saucy, ARM builds stopped working due to a -Werror=unused-local-typedefs issue with the tests (MOCK objects).

- Fix:

The fastest way of dealing with it is simply disabling unused-local-typedefs with a -Wno-error=unused-local-typedefs in the CMakeLists.txt file. We add an option to enable/disable this whenever needed.

- Tests:

N/A

[Stephen M. Webb (bregma)]

I'm all in favour of this. Erroring on unused typedefs is nonsense most of the time anyway.

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:3358
http://jenkins.qa.ubuntu.com/job/unity-ci/118/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-amd64-ci/6/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-saucy-armhf-ci/6
    FAILURE: http://jenkins.qa.ubuntu.com/job/unity-saucy-i386-ci/6/console

Click here to trigger a rebuild:
http://s-jenkins:8080/job/unity-ci/118/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2013-05-29 01:42:16 +0000
+++ CMakeLists.txt	2013-06-05 12:37:46 +0000
@@ -194,6 +194,12 @@
 endif (BOOT_LOGGER)
 
 SET (MAINTAINER_CXXFLAGS "-Werror -Wall -Wcast-align -Wempty-body -Wformat-security -Winit-self -Warray-bounds")
+
+option (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS "Disable errors when local typedefs are unused" ON)
+if (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
+  SET (MAINTAINER_CXXFLAGS "${MAINTAINER_CXXFLAGS} -Wno-error=unused-local-typedefs")
+endif (DISABLE_ERROR_ON_LOCAL_TYPEDEFS_WARNINGS)
+
 option (DISABLE_MAINTAINER_CXXFLAGS "Disable maintainer CXXFlags" OFF)
 if (DISABLE_MAINTAINER_CXXFLAGS)
   SET (MAINTAINER_CXXFLAGS "")