diff options
| author | Yaron Keren <yaron.keren@gmail.com> | 2014-03-25 09:34:20 +0000 |
|---|---|---|
| committer | Yaron Keren <yaron.keren@gmail.com> | 2014-03-25 09:34:20 +0000 |
| commit | e485511e8e243c19f101f2024cec70984c003c08 (patch) | |
| tree | eac0e9360a72ee446bf6dcc787f737f263c5fadb | |
| parent | e706b883047fe52a033db9f70b03a6dbd2c4a3db (diff) | |
| download | bcm5719-llvm-e485511e8e243c19f101f2024cec70984c003c08.tar.gz bcm5719-llvm-e485511e8e243c19f101f2024cec70984c003c08.zip | |
Remove cmake module support for Visual C++ 2010 (MSVC10)
but keep the MSVC11 (Visual C++ 2012) support.
llvm-svn: 204706
| -rw-r--r-- | llvm/cmake/modules/HandleLLVMOptions.cmake | 18 |
1 files changed, 3 insertions, 15 deletions
diff --git a/llvm/cmake/modules/HandleLLVMOptions.cmake b/llvm/cmake/modules/HandleLLVMOptions.cmake index 99657ce1170..d5afc626f93 100644 --- a/llvm/cmake/modules/HandleLLVMOptions.cmake +++ b/llvm/cmake/modules/HandleLLVMOptions.cmake @@ -205,14 +205,8 @@ if( MSVC_IDE ) if( LLVM_COMPILER_JOBS STREQUAL "0" ) add_llvm_definitions( /MP ) else() - if (MSVC10) - message(FATAL_ERROR - "Due to a bug in CMake only 0 and 1 is supported for " - "LLVM_COMPILER_JOBS when generating for Visual Studio 2010") - else() - message(STATUS "Number of parallel compiler jobs set to " ${LLVM_COMPILER_JOBS}) - add_llvm_definitions( /MP${LLVM_COMPILER_JOBS} ) - endif() + message(STATUS "Number of parallel compiler jobs set to " ${LLVM_COMPILER_JOBS}) + add_llvm_definitions( /MP${LLVM_COMPILER_JOBS} ) endif() else() message(STATUS "Parallel compilation disabled") @@ -231,13 +225,7 @@ if( MSVC ) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} /STACK:10000000") endif() - if( MSVC10 ) - # MSVC 10 will complain about headers in the STL not being exported, but - # will not complain in MSVC 11. - add_llvm_definitions( - -wd4275 # Suppress 'An exported class was derived from a class that was not exported.' - ) - elseif( MSVC11 ) + if( MSVC11 ) add_llvm_definitions(-D_VARIADIC_MAX=10) endif() |
