diff options
| author | Justin Holewinski <jholewinski@nvidia.com> | 2012-06-06 03:11:20 +0000 |
|---|---|---|
| committer | Justin Holewinski <jholewinski@nvidia.com> | 2012-06-06 03:11:20 +0000 |
| commit | c82fd37bcf38ff976ce0a62576899588563f8a09 (patch) | |
| tree | 85d165385f524fcb580f039ccec1d197c03610a5 | |
| parent | 4ddf8871ceaa32d60f7834a74c5556fd82ab8d79 (diff) | |
| download | llvm-c82fd37bcf38ff976ce0a62576899588563f8a09.tar.gz llvm-c82fd37bcf38ff976ce0a62576899588563f8a09.tar.bz2 llvm-c82fd37bcf38ff976ce0a62576899588563f8a09.tar.xz | |
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
| -rw-r--r-- | unittests/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | utils/unittest/CMakeLists.txt | 6 |
2 files changed, 12 insertions, 0 deletions
diff --git a/unittests/CMakeLists.txt b/unittests/CMakeLists.txt index 78009a86df..11a5a5ac97 100644 --- 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 73491f0721..70ed35df2e 100644 --- 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 |