summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorYaron Keren <yaron.keren@gmail.com>2014-03-25 09:34:20 +0000
committerYaron Keren <yaron.keren@gmail.com>2014-03-25 09:34:20 +0000
commit6e2aab69a69d3383fe2db77ad06fc5fa4862a65d (patch)
treee077d9090a26e2382848af44f6f0255966a6dd98 /cmake
parentc5f5d0d234ab571014798c23590dfb60526f6ac8 (diff)
downloadllvm-6e2aab69a69d3383fe2db77ad06fc5fa4862a65d.tar.gz
llvm-6e2aab69a69d3383fe2db77ad06fc5fa4862a65d.tar.bz2
llvm-6e2aab69a69d3383fe2db77ad06fc5fa4862a65d.tar.xz
Remove cmake module support for Visual C++ 2010 (MSVC10)
but keep the MSVC11 (Visual C++ 2012) support. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@204706 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/modules/HandleLLVMOptions.cmake18
1 files changed, 3 insertions, 15 deletions
diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake
index 99657ce117..d5afc626f9 100644
--- a/cmake/modules/HandleLLVMOptions.cmake
+++ b/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()