diff options
| author | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-06-04 18:54:16 +0000 |
|---|---|---|
| committer | Evgeniy Stepanov <eugeni.stepanov@gmail.com> | 2015-06-04 18:54:16 +0000 |
| commit | 999b83452dade901ba824da7c9927daec9c3a954 (patch) | |
| tree | 091c4d5047f75843b924506ca0de32a0a7d26a0b | |
| parent | 2b5fe3f5b29cfdc2c329bc2c65d93688f7923461 (diff) | |
| download | bcm5719-llvm-999b83452dade901ba824da7c9927daec9c3a954.tar.gz bcm5719-llvm-999b83452dade901ba824da7c9927daec9c3a954.zip | |
Fix the check for Ninja in the CMake build.
The current check never passes, because CMAKE_MAKE_PROGRAM, at least on Linux,
includes the full path to the "ninja" binary; this effectively disables
compile/link jobs pools.
Use CMAKE_GENERATOR STREQUAL "Ninja" as a more reliable check.
llvm-svn: 239069
| -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 837148bb8d7..9fc602c4631 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_MAKE_PROGRAM STREQUAL "ninja") + if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_GENERATOR STREQUAL "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_MAKE_PROGRAM STREQUAL "ninja") + if(CMAKE_VERSION VERSION_LESS 3.0 OR NOT CMAKE_GENERATOR STREQUAL "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}) |
