From 5bfe3bf8d1fc37b6a10ce295195810a2cd9fe43d Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi Date: Sat, 21 Apr 2012 14:50:56 +0000 Subject: [PATCH] CMake: Prune redundant LLVM_COMPILER_JOBS from llvm/CMakeLists.txt. HandleLLVMOptions.cmake has it. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@155284 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 9 --------- cmake/modules/HandleLLVMOptions.cmake | 2 ++ 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 806126457d4..bfa1efc04c0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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). diff --git a/cmake/modules/HandleLLVMOptions.cmake b/cmake/modules/HandleLLVMOptions.cmake index 3a10a861d67..b4b2bcd7a77 100644 --- a/cmake/modules/HandleLLVMOptions.cmake +++ b/cmake/modules/HandleLLVMOptions.cmake @@ -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.