ref: 7746e3f497720705365823c9d5af90802c8dd647
parent: 69fe242dc7933a356703b5b4488d169dd717ab63
parent: 853e71eb882735b9dc9c02a8a0630654d703ac1c
author: zhilwang <[email protected]>
date: Tue May 6 12:52:57 EDT 2014
Merge pull request #793 from mstorsjo/fix-msvc-gtest Fix building gtest on MSVC 2010 and newer
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -19,7 +19,10 @@
CXX=cl
AR=lib
CXX_O=-Fo$@
-CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -DGTEST_HAS_TR1_TUPLE=1 -DGTEST_USE_OWN_TR1_TUPLE=1
+# -DGTEST_HAS_TR1_TUPLE=0 is temporarily broken in gtest,
+# using _VARIADIC_MAX=10 to fix building on MSVC 2012 meanwhile.
+# Once gtest works with the former again, it should be preferred.
+CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -D_VARIADIC_MAX=10
CXX_LINK_O=-nologo -Fe$@
AR_OPTS=-nologo -out:$@
CFLAGS_OPT=-O2 -Ob1 -Oy- -Zi -GF -Gm- -GS -Gy -DNDEBUG