diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-06-04 19:33:23 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-06-04 19:33:23 +0000 |
| commit | 35b7f81f08d5572e36fc042f69e301d867b6ace4 (patch) | |
| tree | 55e24324942b7f4422e9d9f538058bf48009f120 /llvm | |
| parent | 13415ededd8365dd0562522a12c7163c6c6a0411 (diff) | |
| download | bcm5719-llvm-35b7f81f08d5572e36fc042f69e301d867b6ace4.tar.gz bcm5719-llvm-35b7f81f08d5572e36fc042f69e301d867b6ace4.zip | |
[CMake] Fixing the check for Ninja
Enabling Ninja Job Pools needs to be dependent on the CMAKE_MAKE_PROGRAM not the CMAKE_GENERATOR. There are generators (like "Sublime Text 2 - Ninja") that also generate ninja build files. Basing of the CMAKE_MAKE_PROGRAM is the best future-proof way to handle this.
llvm-svn: 239076
Diffstat (limited to 'llvm')
| -rw-r--r-- | llvm/CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 9fc602c4631..026fe479abd 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -32,7 +32,7 @@ project(LLVM) set(LLVM_PARALLEL_COMPILE_JOBS "" CACHE STRING "Define the maximum number of concurrent compilation jobs.") if(LLVM_PARALLEL_COMPILE_JOBS) - if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_GENERATOR STREQUAL "Ninja") + if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_MAKE_PROGRAM MATCHES "ninja$") message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.") else() set_property(GLOBAL APPEND PROPERTY JOB_POOLS compile_job_pool=${LLVM_PARALLEL_COMPILE_JOBS}) @@ -43,7 +43,7 @@ endif() set(LLVM_PARALLEL_LINK_JOBS "" CACHE STRING "Define the maximum number of concurrent link jobs.") if(LLVM_PARALLEL_LINK_JOBS) - if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_GENERATOR STREQUAL "Ninja") + if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_MAKE_PROGRAM MATCHES "ninja$") message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.") else() set_property(GLOBAL APPEND PROPERTY JOB_POOLS link_job_pool=${LLVM_PARALLEL_LINK_JOBS}) |
