6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-31 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Revert r229185, "Raising minimum required Visual Studio version to 2013."

Browse Source 
All builders are not ready yet.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@229199 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
NAKAMURA Takumi 2015-02-14 00:45:32 +00:00
parent f7f5309424
commit 6b098c4a26
3 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CMakeLists.txt
View File

@ -24,10 +24,6 @@ endif()
project(LLVM) 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. # The following only works with the Ninja generator in CMake >= 3.0.
set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING
"Define the maximum number of concurrent compilation jobs.") "Define the maximum number of concurrent compilation jobs.")

6
cmake/modules/AddLLVM.cmake
View File

@ -584,6 +584,12 @@ function(add_unittest test_suite test_name)
set(EXCLUDE_FROM_ALL ON) set(EXCLUDE_FROM_ALL ON)
endif() 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) include_directories(${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest/include)
if (NOT LLVM_ENABLE_THREADS) if (NOT LLVM_ENABLE_THREADS)
list(APPEND LLVM_COMPILE_DEFINITIONS GTEST_HAS_PTHREAD=0) list(APPEND LLVM_COMPILE_DEFINITIONS GTEST_HAS_PTHREAD=0)

6
utils/unittest/CMakeLists.txt
View File

@ -32,6 +32,12 @@ if (NOT LLVM_ENABLE_THREADS)
add_definitions( -DGTEST_HAS_PTHREAD=0 ) add_definitions( -DGTEST_HAS_PTHREAD=0 )
endif() 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 set(LIBS
LLVMSupport # Depends on llvm::raw_ostream LLVMSupport # Depends on llvm::raw_ostream
) )