Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 { | 5 { |
| 6 'includes': [ | 6 'includes': [ |
| 7 'gtest.gypi', | 7 'gtest.gypi', |
| 8 ], | 8 ], |
| 9 'targets': [ | 9 'targets': [ |
| 10 { | 10 { |
| (...skipping 11 matching lines...) Expand all Loading... | |
| 22 'gtest_prod', | 22 'gtest_prod', |
| 23 ], | 23 ], |
| 24 'defines': [ | 24 'defines': [ |
| 25 # In order to allow regex matches in gtest to be shared between Windows | 25 # In order to allow regex matches in gtest to be shared between Windows |
| 26 # and other systems, we tell gtest to always use it's internal engine. | 26 # and other systems, we tell gtest to always use it's internal engine. |
| 27 'GTEST_HAS_POSIX_RE=0', | 27 'GTEST_HAS_POSIX_RE=0', |
| 28 # Chrome doesn't support / require C++11, yet. | 28 # Chrome doesn't support / require C++11, yet. |
| 29 'GTEST_LANG_CXX11=0', | 29 'GTEST_LANG_CXX11=0', |
| 30 ], | 30 ], |
| 31 'all_dependent_settings': { | 31 'all_dependent_settings': { |
| 32 'include_dirs': [ | |
| 33 'gtest', | |
|
brettw
2016/07/21 19:38:27
You added this one. I don't see this in the GN bui
tzik
2016/07/21 19:57:33
Oops, thanks. A local mod contaminated the path as
| |
| 34 'gtest/include', | |
| 35 ], | |
| 32 'defines': [ | 36 'defines': [ |
| 33 'GTEST_HAS_POSIX_RE=0', | 37 'GTEST_HAS_POSIX_RE=0', |
| 34 'GTEST_LANG_CXX11=0', | 38 'GTEST_LANG_CXX11=0', |
| 35 ], | 39 ], |
| 36 }, | 40 }, |
| 37 'conditions': [ | 41 'conditions': [ |
| 38 ['OS == "mac" or OS == "ios"', { | 42 ['OS == "mac" or OS == "ios"', { |
| 39 'sources': [ | 43 'sources': [ |
| 40 'gtest_mac.h', | 44 'gtest_mac.h', |
| 41 'gtest_mac.mm', | 45 'gtest_mac.mm', |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 114 'defines': [ | 118 'defines': [ |
| 115 'GTEST_HAS_CLONE=0', | 119 'GTEST_HAS_CLONE=0', |
| 116 ], | 120 ], |
| 117 }, | 121 }, |
| 118 }], | 122 }], |
| 119 ], | 123 ], |
| 120 'direct_dependent_settings': { | 124 'direct_dependent_settings': { |
| 121 'defines': [ | 125 'defines': [ |
| 122 'UNIT_TEST', | 126 'UNIT_TEST', |
| 123 ], | 127 ], |
| 124 'include_dirs': [ | |
| 125 'gtest/include', # So that gtest headers can find themselves. | |
| 126 ], | |
| 127 'target_conditions': [ | 128 'target_conditions': [ |
| 128 ['_type=="executable"', { | 129 ['_type=="executable"', { |
| 129 'test': 1, | 130 'test': 1, |
| 130 'conditions': [ | 131 'conditions': [ |
| 131 ['OS=="mac"', { | 132 ['OS=="mac"', { |
| 132 'run_as': { | 133 'run_as': { |
| 133 'action????': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}'], | 134 'action????': ['${BUILT_PRODUCTS_DIR}/${PRODUCT_NAME}'], |
| 134 }, | 135 }, |
| 135 }], | 136 }], |
| 136 ['OS=="ios"', { | 137 ['OS=="ios"', { |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 168 { | 169 { |
| 169 'target_name': 'gtest_prod', | 170 'target_name': 'gtest_prod', |
| 170 'toolsets': ['host', 'target'], | 171 'toolsets': ['host', 'target'], |
| 171 'type': 'none', | 172 'type': 'none', |
| 172 'sources': [ | 173 'sources': [ |
| 173 'gtest/include/gtest/gtest_prod.h', | 174 'gtest/include/gtest/gtest_prod.h', |
| 174 ], | 175 ], |
| 175 }, | 176 }, |
| 176 ], | 177 ], |
| 177 } | 178 } |
| OLD | NEW |