ref: 3f982a4de485f7ddbde702782f9c6d7de247d59e
parent: f946b24e635b3f2613ede41405c399c9b3685fc5
author: Martin Storsjö <martin@martin.st>
date: Fri May 16 04:53:59 EDT 2014
Clarify a comment about MSVC parameters to fix building gtest The temporary bug in gtest has now been fixed, but we still can keep using the current way of fixing MSVC 2012 builds instead of switching to the solution used previously.
--- a/build/platform-msvc-common.mk
+++ b/build/platform-msvc-common.mk
@@ -17,9 +17,11 @@
CXX=cl
AR=lib
CXX_O=-Fo$@
-# -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.
+# -D_VARIADIC_MAX=10 is required to fix building gtest on MSVC 2012, but
+# since we don't (easily) know which version of MSVC we use here, we add
+# it unconditionally. The same issue can also be worked around by adding
+# -DGTEST_HAS_TR1_TUPLE=0 instead, but we prefer this version since it
+# matches what gtest itself does.
CFLAGS += -nologo -W3 -EHsc -fp:precise -Zc:wchar_t -Zc:forScope -D_VARIADIC_MAX=10
CXX_LINK_O=-nologo -Fe$@
AR_OPTS=-nologo -out:$@