Fix gtest build issue on Visual Studio 2012 RC

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@158046 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt
index 78009a86df55b5d7e54dd8219badb2773be1c806..11a5a5ac9757e95159b00a005373b8289ae58e92 100644 (file)
--- a/unittests/CMakeLists.txt
+++ b/unittests/CMakeLists.txt
@@ -15,6 +15,12 @@ function(add_llvm_unittest test_dirname)
   set_target_properties(${test_name}Tests PROPERTIES FOLDER "Tests")
 endfunction()
 
+# Visual Studio 2012 only supports up to 8 template parameters in
+# std::tr1::tuple by default, but gtest requires 10
+if(MSVC AND MSVC_VERSION EQUAL 1700)
+  add_definitions(-D_VARIADIC_MAX=10)
+endif ()
+
 add_custom_target(UnitTests)
 set_target_properties(UnitTests PROPERTIES FOLDER "Tests")
 

diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt
index 73491f0721d5e700aed054fc5d0bf3be3b864788..70ed35df2e6c18d10dd40892708ad81d0a89401c 100644 (file)
--- a/utils/unittest/CMakeLists.txt
+++ b/utils/unittest/CMakeLists.txt
@@ -27,6 +27,12 @@ endif()
 set(LLVM_REQUIRES_RTTI 1)
 add_definitions( -DGTEST_HAS_RTTI=0 )
 
+# Visual Studio 2012 only supports up to 8 template parameters in
+# std::tr1::tuple by default, but gtest requires 10
+if(MSVC AND MSVC_VERSION EQUAL 1700)
+  add_definitions(-D_VARIADIC_MAX=10)
+endif ()
+
 add_llvm_library(gtest
   googletest/gtest.cc
   googletest/gtest-death-test.cc