diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-02-14 00:45:32 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-02-14 00:45:32 +0000 |
| commit | 3d1b0aa0082339913476a806b322fb86170891a9 (patch) | |
| tree | 1e8e4bcfff171a6c28e65ec7f6b6e942eb70b702 /llvm/cmake/modules/AddLLVM.cmake | |
| parent | 426078055248bcbfc5b818e703333113c5e61594 (diff) | |
| download | bcm5719-llvm-3d1b0aa0082339913476a806b322fb86170891a9.tar.gz bcm5719-llvm-3d1b0aa0082339913476a806b322fb86170891a9.zip | |
Revert r229185, "Raising minimum required Visual Studio version to 2013."
All builders are not ready yet.
llvm-svn: 229199
Diffstat (limited to 'llvm/cmake/modules/AddLLVM.cmake')
| -rw-r--r-- | llvm/cmake/modules/AddLLVM.cmake | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake index b265d8661a7..dae8e758c7c 100644 --- a/llvm/cmake/modules/AddLLVM.cmake +++ b/llvm/cmake/modules/AddLLVM.cmake @@ -584,6 +584,12 @@ function(add_unittest test_suite test_name) set(EXCLUDE_FROM_ALL ON) endif() + # 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) + list(APPEND LLVM_COMPILE_DEFINITIONS _VARIADIC_MAX=10) + endif () + include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include) if (NOT LLVM_ENABLE_THREADS) list(APPEND LLVM_COMPILE_DEFINITIONS GTEST_HAS_PTHREAD=0) |
