diff options
| author | Brad King <brad.king@kitware.com> | 2020-03-27 11:49:29 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-03-27 11:50:28 (GMT) |
| commit | a6611577c33538af959348b49aec817dd9649c03 (patch) | |
| tree | 788be17486c62f52ca6966fb6640a60592242aa3 /Source/cmLocalNinjaGenerator.cxx | |
| parent | 7e3d81b1df9e2c192585d83300344546439e50bd (diff) | |
| parent | c84cf42897e4d95706d4f750c2ad085c84a259f2 (diff) | |
| download | CMake-a6611577c33538af959348b49aec817dd9649c03.zip CMake-a6611577c33538af959348b49aec817dd9649c03.tar.gz CMake-a6611577c33538af959348b49aec817dd9649c03.tar.bz2 | |
Merge topic 'cmprop-getglobalprop'
c84cf42897 cmState::GetGlobalProperty: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !4521
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index 1568397..7e54f11 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -252,15 +252,15 @@ void cmLocalNinjaGenerator::WritePools(std::ostream& os) { cmGlobalNinjaGenerator::WriteDivider(os); - const char* jobpools = + cmProp jobpools = this->GetCMakeInstance()->GetState()->GetGlobalProperty("JOB_POOLS"); if (!jobpools) { - jobpools = this->GetMakefile()->GetDefinition("CMAKE_JOB_POOLS"); + jobpools = this->GetMakefile()->GetDef("CMAKE_JOB_POOLS"); } if (jobpools) { cmGlobalNinjaGenerator::WriteComment( os, "Pools defined by global property JOB_POOLS"); - std::vector<std::string> pools = cmExpandedList(jobpools); + std::vector<std::string> pools = cmExpandedList(*jobpools); for (std::string const& pool : pools) { const std::string::size_type eq = pool.find('='); unsigned int jobs; |