diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2014-01-09 03:54:01 (GMT) |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2014-01-09 03:54:01 (GMT) |
| commit | 685719d9562039ab3b9899591a32d33525bb8b9a (patch) | |
| tree | e695163ca7a7f35d54ad1146cb288c856c3bb859 | |
| parent | 3e4bf25c40450393b5c5006c11d6e4236294c804 (diff) | |
| parent | c0b1e4d75e2839add8c856ce6ceabb3e91a8666a (diff) | |
| download | Ninja-685719d9562039ab3b9899591a32d33525bb8b9a.zip Ninja-685719d9562039ab3b9899591a32d33525bb8b9a.tar.gz Ninja-685719d9562039ab3b9899591a32d33525bb8b9a.tar.bz2 | |
Merge pull request #701 from nickhutchinson/feature/msvc-gtest-cflags
configure.py: use /FS flag under vs2013 when compiling gtest
| -rwxr-xr-x | configure.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/configure.py b/configure.py index cceb0f7..da2f6ef 100755 --- a/configure.py +++ b/configure.py @@ -328,7 +328,10 @@ if options.with_gtest: gtest_all_incs = '-I%s -I%s' % (path, os.path.join(path, 'include')) if platform.is_msvc(): - gtest_cflags = '/nologo /EHsc /Zi /D_VARIADIC_MAX=10 ' + gtest_all_incs + gtest_cflags = '/nologo /EHsc /Zi /D_VARIADIC_MAX=10 ' + if platform.msvc_needs_fs(): + gtest_cflags += '/FS ' + gtest_cflags += gtest_all_incs else: gtest_cflags = '-fvisibility=hidden ' + gtest_all_incs objs += n.build(built('gtest-all' + objext), 'cxx', |