diff options
| author | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-08-01 19:00:00 (GMT) |
|---|---|---|
| committer | Vitaly Stakhovsky <vvs31415@gitlab.org> | 2020-09-02 11:27:32 (GMT) |
| commit | 11425041f04fd0945480b8f9e9933d1549b93981 (patch) | |
| tree | 9cafffd6774513f686440b31795cbb3b5e38b65c /Source/cmLocalNinjaGenerator.cxx | |
| parent | 99b21e58e020fedc6d09a619c1a8dc2e9ea7e2c5 (diff) | |
| download | CMake-11425041f04fd0945480b8f9e9933d1549b93981.zip CMake-11425041f04fd0945480b8f9e9933d1549b93981.tar.gz CMake-11425041f04fd0945480b8f9e9933d1549b93981.tar.bz2 | |
cmMakefile::GetDefinition: return cmProp
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"; |