| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 config("gmock_config") { | 5 config("gmock_config") { |
| 6 # Gmock headers need to be able to find themselves. | 6 # Gmock headers need to be able to find themselves. |
| 7 include_dirs = [ "include" ] | 7 include_dirs = [ "include" ] |
| 8 |
| 9 if (is_clang) { |
| 10 # The |MOCK_METHODn()| macros do not specify "override", which triggers this |
| 11 # warning: "error: 'Method' overrides a member function but is not marked |
| 12 # 'override'". |
| 13 cflags = [ "-Wno-inconsistent-missing-override" ] |
| 14 } |
| 8 } | 15 } |
| 9 | 16 |
| 10 static_library("gmock") { | 17 static_library("gmock") { |
| 11 # TODO http://crbug.com/412064 enable this flag all the time. | 18 # TODO http://crbug.com/412064 enable this flag all the time. |
| 12 testonly = !is_component_build | 19 testonly = !is_component_build |
| 13 sources = [ | 20 sources = [ |
| 14 # Sources based on files in r173 of gmock. | 21 # Sources based on files in r173 of gmock. |
| 15 "include/gmock/gmock-actions.h", | 22 "include/gmock/gmock-actions.h", |
| 16 "include/gmock/gmock-cardinalities.h", | 23 "include/gmock/gmock-cardinalities.h", |
| 17 "include/gmock/gmock-generated-actions.h", | 24 "include/gmock/gmock-generated-actions.h", |
| (...skipping 27 matching lines...) Expand all Loading... |
| 45 static_library("gmock_main") { | 52 static_library("gmock_main") { |
| 46 # TODO http://crbug.com/412064 enable this flag all the time. | 53 # TODO http://crbug.com/412064 enable this flag all the time. |
| 47 testonly = !is_component_build | 54 testonly = !is_component_build |
| 48 sources = [ | 55 sources = [ |
| 49 "src/gmock_main.cc", | 56 "src/gmock_main.cc", |
| 50 ] | 57 ] |
| 51 deps = [ | 58 deps = [ |
| 52 ":gmock", | 59 ":gmock", |
| 53 ] | 60 ] |
| 54 } | 61 } |
| OLD | NEW |