diff options
| author | Bill Wendling <isanbard@gmail.com> | 2012-04-23 06:45:46 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2012-04-23 06:45:46 +0000 |
| commit | 2652bc940401925fed582bc10bed0ab978f0b389 (patch) | |
| tree | 2cb06a343159575527b319cf788abfab7e207da1 | |
| parent | fc9f961f58a8ba6fc6e1a2af3930f2872d36a2b0 (diff) | |
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.
------------------------------------------------------------------------
git-svn-id: https://llvm.org/svn/llvm-project/llvm/branches/release_31@155334 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | CMakeLists.txt | 9 | ||||
| -rw-r--r-- | cmake/modules/HandleLLVMOptions.cmake | 2 |
2 files changed, 2 insertions, 9 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index a98dd50059..329dd30bb5 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 3a10a861d6..b4b2bcd7a7 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. |