diff options
| author | Hiroyuki Iwatsuki <don@na.rim.or.jp> | 2012-01-25 08:43:26 (GMT) |
|---|---|---|
| committer | Hiroyuki Iwatsuki <don@na.rim.or.jp> | 2012-01-25 08:43:26 (GMT) |
| commit | d8775e0db82fe140d97fc1bc26730eec17e93776 (patch) | |
| tree | 0e5a15d62b6eabe714b62a11b816d0f62f5b7c57 /configure.py | |
| parent | d3bcb4a00eb9b59946a90541447a606de74c0bbb (diff) | |
| download | Ninja-d8775e0db82fe140d97fc1bc26730eec17e93776.zip Ninja-d8775e0db82fe140d97fc1bc26730eec17e93776.tar.gz Ninja-d8775e0db82fe140d97fc1bc26730eec17e93776.tar.bz2 | |
Just add /nologo to gtest_cflags, instead of use cflags + gtest_cflags
Diffstat (limited to 'configure.py')
| -rwxr-xr-x | configure.py | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/configure.py b/configure.py index 0133043..9e1436f 100755 --- a/configure.py +++ b/configure.py @@ -257,15 +257,15 @@ if options.with_gtest: gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include')) if platform == 'windows': - gtest_cflags = '/EHsc ' + gtest_all_incs + gtest_cflags = '/nologo /EHsc ' + gtest_all_incs else: gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs objs += n.build(built('gtest-all' + objext), 'cxx', os.path.join(path, 'src/gtest-all.cc'), - variables=[('cflags', cflags + [gtest_cflags])]) + variables=[('cflags', gtest_cflags)]) objs += n.build(built('gtest_main' + objext), 'cxx', os.path.join(path, 'src/gtest_main.cc'), - variables=[('cflags', cflags + [gtest_cflags])]) + variables=[('cflags', gtest_cflags)]) test_cflags = cflags + ['-I%s' % os.path.join(path, 'include')] elif platform == 'windows': |