From 1e607d71d254e05666ae5b2633b22786dc99cdfc Mon Sep 17 00:00:00 2001 From: zhiliang wang Date: Tue, 6 May 2014 13:06:37 +0800 Subject: [PATCH] Fix gtest build error when OS=msvc. --- build/platform-msvc-common.mk | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build/platform-msvc-common.mk b/build/platform-msvc-common.mk index ca197e4081..0ec91942fd 100644 --- a/build/platform-msvc-common.mk +++ b/build/platform-msvc-common.mk @@ -19,7 +19,7 @@ CC=cl CXX=cl AR=lib CXX_O=-Fo$@ -CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -DGTEST_HAS_TR1_TUPLE=0 +CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -DGTEST_HAS_TR1_TUPLE=1 -DGTEST_USE_OWN_TR1_TUPLE=1 CXX_LINK_O=-nologo -Fe$@ AR_OPTS=-nologo -out:$@ CFLAGS_OPT=-O2 -Ob1 -Oy- -Zi -GF -Gm- -GS -Gy -DNDEBUG