diff options
| author | Brad King <brad.king@kitware.com> | 2017-12-04 15:38:43 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-12-04 15:38:51 (GMT) |
| commit | 5f87ea160378265c70c97d1f627c23e6faf02378 (patch) | |
| tree | 37449f2b8c20a984d59e2f6c49a2ce3aa427f632 /Source | |
| parent | 7f881d159ceb2de70f7d648ad3c113ce18d1a3a7 (diff) | |
| parent | 07185055d57f28347a1850a1f06787ac93f20afd (diff) | |
| download | CMake-5f87ea160378265c70c97d1f627c23e6faf02378.zip CMake-5f87ea160378265c70c97d1f627c23e6faf02378.tar.gz CMake-5f87ea160378265c70c97d1f627c23e6faf02378.tar.bz2 | |
Merge topic 'cmake-job-pool'
07185055 Ninja: add CMAKE_JOB_POOLS variable as default for JOBS_POOLS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1514
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 477ce51..2d969d2 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -207,6 +207,9 @@ void cmLocalNinjaGenerator::WritePools(std::ostream& os) const char* jobpools = this->GetCMakeInstance()->GetState()->GetGlobalProperty("JOB_POOLS"); + if (!jobpools) { + jobpools = this->GetMakefile()->GetDefinition("CMAKE_JOB_POOLS"); + } if (jobpools) { cmGlobalNinjaGenerator::WriteComment( os, "Pools defined by global property JOB_POOLS"); |