diff options
| author | Brad King <brad.king@kitware.com> | 2020-09-03 13:17:58 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2020-09-03 13:18:05 (GMT) |
| commit | ca5babfd7a1da8e32f927ad086fdd91c2b09853b (patch) | |
| tree | 23619c551a1b4c24ff228f98a3503b64a189fb32 /Source/cmLocalNinjaGenerator.cxx | |
| parent | 85e52ea704e13bbf932cd65c225b82f9b945e071 (diff) | |
| parent | 11425041f04fd0945480b8f9e9933d1549b93981 (diff) | |
| download | CMake-ca5babfd7a1da8e32f927ad086fdd91c2b09853b.zip CMake-ca5babfd7a1da8e32f927ad086fdd91c2b09853b.tar.gz CMake-ca5babfd7a1da8e32f927ad086fdd91c2b09853b.tar.bz2 | |
Merge topic 'getdef'
11425041f0 cmMakefile::GetDefinition: return cmProp
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5179
Diffstat (limited to 'Source/cmLocalNinjaGenerator.cxx')
| -rw-r--r-- | Source/cmLocalNinjaGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmLocalNinjaGenerator.cxx b/Source/cmLocalNinjaGenerator.cxx index eb841d9..2188d7f 100644 --- a/Source/cmLocalNinjaGenerator.cxx +++ b/Source/cmLocalNinjaGenerator.cxx @@ -312,7 +312,7 @@ void cmLocalNinjaGenerator::WritePools(std::ostream& os) cmProp jobpools = this->GetCMakeInstance()->GetState()->GetGlobalProperty("JOB_POOLS"); if (!jobpools) { - jobpools = this->GetMakefile()->GetDef("CMAKE_JOB_POOLS"); + jobpools = this->GetMakefile()->GetDefinition("CMAKE_JOB_POOLS"); } if (jobpools) { cmGlobalNinjaGenerator::WriteComment( @@ -363,7 +363,8 @@ void cmLocalNinjaGenerator::WriteProcessedMakefile(std::ostream& os) { cmGlobalNinjaGenerator::WriteDivider(os); os << "# Write statements declared in CMakeLists.txt:\n" - << "# " << this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE") + << "# " + << cmToCStr(this->Makefile->GetDefinition("CMAKE_CURRENT_LIST_FILE")) << '\n'; if (this->IsRootMakefile()) { os << "# Which is the root file.\n"; |