diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-02-15 17:53:10 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2015-02-15 17:53:10 +0000 |
| commit | 068db0bdb8039add959e5553686e1ac9867f6920 (patch) | |
| tree | e166992c9e18829f3531db1f75ef4f0b39553f2d | |
| parent | 962ebd4f23f61599b789bb213c3da82225459c16 (diff) | |
Reapply r229185(cbieneman) -- Raising minimum required Visual Studio version to 2013.
This is based on the discussions on: [LLVMdev] [RFC] Raising LLVM minimum required MSVC version to 2013 for trunk
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229320 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | cmake/modules/AddLLVM.cmake | 6 | ||||
| -rw-r--r-- | utils/unittest/CMakeLists.txt | 6 |
3 files changed, 4 insertions, 12 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index afcc9f0ce2a..4f00395fd60 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -24,6 +24,10 @@ endif() project(LLVM) +if (MSVC AND MSVC_VERSION LESS 1800) + message(FATAL_ERROR "Minimum required MSVC version is 2013!") +endif () + # The following only works with the Ninja generator in CMake >= 3.0. set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING "Define the maximum number of concurrent compilation jobs.") diff --git a/cmake/modules/AddLLVM.cmake b/cmake/modules/AddLLVM.cmake index dae8e758c7c..b265d8661a7 100644 --- a/cmake/modules/AddLLVM.cmake +++ b/cmake/modules/AddLLVM.cmake @@ -584,12 +584,6 @@ 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) diff --git a/utils/unittest/CMakeLists.txt b/utils/unittest/CMakeLists.txt index 7ac894dff14..b34e22ae0cb 100644 --- a/utils/unittest/CMakeLists.txt +++ b/utils/unittest/CMakeLists.txt @@ -32,12 +32,6 @@ if (NOT LLVM_ENABLE_THREADS) add_definitions( -DGTEST_HAS_PTHREAD=0 ) 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) - add_definitions(-D_VARIADIC_MAX=10) -endif () - set(LIBS LLVMSupport # Depends on llvm::raw_ostream ) |