projects
/
platform
/
upstream
/
ninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3e4bf25
)
configure.py: use /FS flag under vs2013 when compiling gtest
author
Nicholas Hutchinson
<nshutchinson@gmail.com>
Thu, 9 Jan 2014 02:35:36 +0000
(15:35 +1300)
committer
Nicholas Hutchinson
<nshutchinson@gmail.com>
Thu, 9 Jan 2014 02:36:57 +0000
(15:36 +1300)
configure.py
patch
|
blob
|
history
diff --git
a/configure.py
b/configure.py
index
cceb0f7
..
da2f6ef
100755
(executable)
--- 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',