[llvm-branch-commits] [llvm-branch] r155334 - in /llvm/branches/release_31: ./ CMakeLists.txt cmake/modules/HandleLLVMOptions.cmake

[Bill Wendling]

Author: void
Date: Mon Apr 23 01:45:46 2012
New Revision: 155334

URL: http://llvm.org/viewvc/llvm-project?rev=155334&view=rev
Log:
Merging r155284:
------------------------------------------------------------------------
r155284 | chapuni | 2012-04-21 07:50:56 -0700 (Sat, 21 Apr 2012) | 1 line

CMake: Prune redundant LLVM_COMPILER_JOBS from llvm/CMakeLists.txt. HandleLLVMOptions.cmake has it.
------------------------------------------------------------------------

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

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

Modified: llvm/branches/release_31/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/release_31/CMakeLists.txt?rev=155334&r1=155333&r2=155334&view=diff
==============================================================================
--- llvm/branches/release_31/CMakeLists.txt (original)
+++ llvm/branches/release_31/CMakeLists.txt Mon Apr 23 01:45:46 2012
@@ -213,15 +213,6 @@
   set(LLVM_LIT_TOOLS_DIR "" CACHE PATH "Path to GnuWin32 tools")
 endif()
 
-# 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 supports it but it is experimental.
-  set(LLVM_COMPILER_JOBS "0" CACHE STRING
-    "Number of parallel compiler jobs. 0 means use all processors. Default is 0.")
-endif()
-
 # Define options to control the inclusion and default build behavior for
 # components which may not strictly be necessary (tools, runtime, examples, and
 # tests).

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=155334&r1=155333&r2=155334&view=diff
==============================================================================
--- llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake (original)
+++ llvm/branches/release_31/cmake/modules/HandleLLVMOptions.cmake Mon Apr 23 01:45:46 2012
@@ -110,6 +110,8 @@
   endif( LLVM_BUILD_32_BITS )
 endif( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 )
 
+# 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.