[llvm-branch-commits] [llvm-branch] r155335 - in /llvm/branches/release_31: ./ cmake/modules/HandleLLVMOptions.cmake

[Bill Wendling]

Author: void
Date: Mon Apr 23 01:46:30 2012
New Revision: 155335

URL: http://llvm.org/viewvc/llvm-project?rev=155335&view=rev
Log:
Merging r155285:
------------------------------------------------------------------------
r155285 | chapuni | 2012-04-21 07:51:02 -0700 (Sat, 21 Apr 2012) | 1 line

CMake: Enable LLVM_COMPILER_JOBS on all MS IDEs. We don't support older environments than VS9.
------------------------------------------------------------------------

Modified:
    llvm/branches/release_31/   (props changed)
    llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake

Propchange: llvm/branches/release_31/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Apr 23 01:46:30 2012
@@ -1,3 +1,3 @@
 /llvm/branches/Apple/Pertwee:110850,110961
 /llvm/branches/type-system-rewrite:133420-134817
-/llvm/trunk:155230,155284,155307
+/llvm/trunk:155230,155284-155285,155307

Modified: llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake?rev=155335&r1=155334&r2=155335&view=diff
==============================================================================
--- llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake Mon Apr 23 01:46:30 2012
@@ -112,9 +112,7 @@
 
 # On Win32 using MS tools, provide an option to set the number of parallel jobs
 # to use.
-if( MSVC_IDE AND ( MSVC90 OR MSVC10 ) )
-  # Only Visual Studio 2008 and 2010 officially supports /MP.
-  # Visual Studio 2005 do support it but it's experimental there.
+if( MSVC_IDE )
   set(LLVM_COMPILER_JOBS "0" CACHE STRING
     "Number of parallel compiler jobs. 0 means use all processors. Default is 0.")
   if( NOT LLVM_COMPILER_JOBS STREQUAL "1" )