Merge lp:~michihenning/unity-api/fix-clang-warning into lp:unity-api

Proposed by Michi Henning
Status: Merged
Approved by: Jussi Pakkanen
Approved revision: 109
Merged at revision: 109
Proposed branch: lp:~michihenning/unity-api/fix-clang-warning
Merge into: lp:unity-api
Diff against target: 12 lines (+5/-0)
1 file modified
test/gtest/libgtest/CMakeLists.txt (+5/-0)
To merge this branch: bzr merge lp:~michihenning/unity-api/fix-clang-warning
Reviewer Review Type Date Requested Status
PS Jenkins bot (community) continuous-integration Approve
Unity Team Pending
Review via email: mp+191936@code.launchpad.net

Commit message

Fix warning from clang when building libgtest about unused field.

Description of the change

Fix warning from clang when building libgtest about unused field.

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

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'test/gtest/libgtest/CMakeLists.txt'
2--- test/gtest/libgtest/CMakeLists.txt 2013-05-13 11:39:49 +0000
3+++ test/gtest/libgtest/CMakeLists.txt 2013-10-21 04:36:56 +0000
4@@ -11,3 +11,8 @@
5 )
6
7 set_target_properties(gtest PROPERTIES INCLUDE_DIRECTORIES ${GTEST_INCLUDE_DIR})
8+
9+# Clang complains about unused private field 'pretty_' in gtest-internal-inl.h.
10+if("${CMAKE_CXX_COMPILER_ID}" STREQUAL "Clang")
11+ set_target_properties(gtest PROPERTIES COMPILE_FLAGS "-Wno-unused-private-field")
12+endif()

Subscribers

People subscribed via source and target branches

to all changes: