diff options
| author | Chris Bieneman <beanz@apple.com> | 2017-02-07 19:06:22 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2017-02-07 19:06:22 +0000 |
| commit | d2206e4788f2c42a67a7085ccc0f1acdd4acc0cd (patch) | |
| tree | 747c105da3a4b0dab45b09d10ad782ea56b8ff74 /CMakeLists.txt | |
| parent | 6271cac448f1a2df43cb84ee57f6c35152ca5ae8 (diff) | |
[CMake] Move ninja job pool options to HandleLLVMOptions
Moving the Ninja job pool configuration settings into the HandleLLVMOptions module will allow standalone builds of LLVM sub-projects to use the LLVM options without needing to re-implement them.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@294334 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 23 |
1 files changed, 0 insertions, 23 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index c2c9fe0a68b..fa7790642b4 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -132,18 +132,6 @@ foreach(proj ${LLVM_ENABLE_PROJECTS}) endif() endforeach() -# The following only works with the Ninja generator in CMake >= 3.0. -set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING - "Define the maximum number of concurrent compilation jobs.") -if(LLVM_PARALLEL_COMPILE_JOBS) - if(NOT CMAKE_MAKE_PROGRAM MATCHES "ninja") - message(WARNING "Job pooling is only available with Ninja generators.") - else() - set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LLVM_PARALLEL_COMPILE_JOBS}) - set(CMAKE_JOB_POOL_COMPILE compile_job_pool) - endif() -endif() - # Build llvm with ccache if the package is present set(LLVM_CCACHE_BUILD OFF CACHE BOOL "Set to ON for a ccache enabled build") if(LLVM_CCACHE_BUILD) @@ -183,17 +171,6 @@ if(LLVM_BUILD_GLOBAL_ISEL) add_definitions(-DLLVM_BUILD_GLOBAL_ISEL) endif() -set(LLVM_PARALLEL_LINK_JOBS "" CACHE STRING - "Define the maximum number of concurrent link jobs.") -if(LLVM_PARALLEL_LINK_JOBS) - if(NOT CMAKE_MAKE_PROGRAM MATCHES "ninja") - message(WARNING "Job pooling is only available with Ninja generators.") - else() - set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LLVM_PARALLEL_LINK_JOBS}) - set(CMAKE_JOB_POOL_LINK link_job_pool) - endif() -endif() - # Add path for custom modules set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} |