[llvm] r204706 - Remove cmake module support for Visual C++ 2010 (MSVC10)
Yaron Keren
yaron.keren at gmail.com
Tue Mar 25 02:34:21 PDT 2014
Author: yrnkrn
Date: Tue Mar 25 04:34:20 2014
New Revision: 204706
URL: http://llvm.org/viewvc/llvm-project?rev=204706&view=rev
Log:
Remove cmake module support for Visual C++ 2010 (MSVC10)
but keep the MSVC11 (Visual C++ 2012) support.
Modified:
llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
Modified: llvm/trunk/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/HandleLLVMOptions.cmake?rev=204706&r1=204705&r2=204706&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/trunk/cmake/modules/HandleLLVMOptions.cmake Tue Mar 25 04:34:20 2014
@@ -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()
More information about the llvm-commits
mailing list