Commit 30f2ef37 authored by Bill Wendling's avatar Bill Wendling
Browse files

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.
------------------------------------------------------------------------

llvm-svn: 155334
parent 4ea5fe07

llvm/CMakeLists.txt

+0 −9
Original line number Diff line number Diff line
@@ -213,15 +213,6 @@ if( WIN32 AND NOT CYGWIN ) 
  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).

llvm/cmake/modules/HandleLLVMOptions.cmake

+2 −0
Original line number Diff line number Diff line
@@ -110,6 +110,8 @@ if( CMAKE_SIZEOF_VOID_P EQUAL 8 AND NOT WIN32 ) 
  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.