diff options
| author | Chris Bieneman <beanz@apple.com> | 2016-06-08 22:38:30 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2016-06-08 22:38:30 +0000 |
| commit | 35c7f9627b59172b7fe75e94124291bf65e46785 (patch) | |
| tree | 887c8808617cba93226096283551c73e767c1a6a | |
| parent | 3adaa8cf4a6df45430b47a62c649c7cb54bb1626 (diff) | |
| download | bcm5719-llvm-35c7f9627b59172b7fe75e94124291bf65e46785.tar.gz bcm5719-llvm-35c7f9627b59172b7fe75e94124291bf65e46785.zip | |
[CMake] Cleanup version checks for CMake 3.0
This just removes some redundant checks and updates warning text.
llvm-svn: 272218
| -rw-r--r-- | llvm/CMakeLists.txt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/llvm/CMakeLists.txt b/llvm/CMakeLists.txt index 7c06d745135..8ea0b90d991 100644 --- a/llvm/CMakeLists.txt +++ b/llvm/CMakeLists.txt @@ -69,8 +69,8 @@ endif() 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 MATCHES "ninja") - message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.") + 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) @@ -85,8 +85,8 @@ 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 MATCHES "ninja") - message(WARNING "Job pooling is only available with Ninja generators and CMake 3.0 and later.") + 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) |
