Chromium Code Reviews| Index: Source/wtf/wtf_tests.gyp |
| diff --git a/Source/modules/modules.gyp b/Source/wtf/wtf_tests.gyp |
| similarity index 66% |
| copy from Source/modules/modules.gyp |
| copy to Source/wtf/wtf_tests.gyp |
| index 5febaa82c5fc05df1d4fb1b240424f50c8edf60a..3cc33a10a714d986275257f1cc395c7a175febf8 100644 |
| --- a/Source/modules/modules.gyp |
| +++ b/Source/wtf/wtf_tests.gyp |
| @@ -1,4 +1,3 @@ |
| -# |
| # Copyright (C) 2013 Google Inc. All rights reserved. |
| # |
| # Redistribution and use in source and binary forms, with or without |
| @@ -26,24 +25,37 @@ |
| # THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT |
| # (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
| # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
| -# |
| { |
| 'includes': [ |
| '../WebKit/chromium/WinPrecompile.gypi', |
| - 'modules.gypi', |
| + 'wtf.gypi', |
| + ], |
| + 'conditions': [ |
| + ['gcc_version>=46', { |
| + 'target_defaults': { |
| + # Disable warnings about c++0x compatibility, as some names (such as nullptr) conflict |
| + # with upcoming c++0x types. |
| + 'cflags_cc': ['-Wno-c++0x-compat'], |
| + }, |
| + }], |
| ], |
| - 'targets': [{ |
| - 'target_name': 'modules', |
| - 'type': 'static_library', |
| - 'dependencies': [ |
| - '<(DEPTH)/third_party/zlib/zlib.gyp:zlib', |
| - '../config.gyp:config', |
| - '../core/core.gyp/core.gyp:webcore', |
| - ], |
| - 'sources': [ |
| - '<@(modules_files)', |
| - ], |
| - # Disable c4267 warnings until we fix size_t to int truncations. |
| - 'msvs_disabled_warnings': [ 4267, 4334, ] |
| - }], |
| + 'targets': [ |
| + { |
| + 'target_name': 'wtf_unittests', |
| + 'type': 'executable', |
| + 'include_dirs': [ |
| + '..', |
| + ], |
| + 'dependencies': [ |
| + 'wtf.gyp:wtf', |
| + '<(DEPTH)/testing/gmock.gyp:gmock', |
| + '<(DEPTH)/testing/gtest.gyp:gtest', |
| + ], |
| + 'sources': [ |
| + '<@(wtf_unittest_files)', |
| + ], |
| + # Disable c4267 warnings until we fix size_t to int truncations. |
| + 'msvs_disabled_warnings': [4127, 4355, 4510, 4512, 4610, 4706, 4068, 4267], |
|
abarth-chromium
2013/05/26 00:29:59
Can we put all this junk into config.gyp? (Ideall
|
| + }, |
| + ] |
| } |