diff options
| author | Brad King <brad.king@kitware.com> | 2019-05-17 13:25:56 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2019-05-17 13:26:05 (GMT) |
| commit | 3020354f7c86f959d707aed2b833692204dd7778 (patch) | |
| tree | 79dc1ca02491338fe78001ffdd4c72ad26cac212 /Source/cmMakefileTargetGenerator.cxx | |
| parent | 736f9d184da2109b009078e3184e996883bd7554 (diff) | |
| parent | 23e8364aedcbeb7ce606b6075c98827e52f0c7f6 (diff) | |
| download | CMake-3020354f7c86f959d707aed2b833692204dd7778.zip CMake-3020354f7c86f959d707aed2b833692204dd7778.tar.gz CMake-3020354f7c86f959d707aed2b833692204dd7778.tar.bz2 | |
Merge topic 'string-cleanup'
23e8364aed Source: std::string related cleanup
Acked-by: Kitware Robot <kwrobot@kitware.com>
Acked-by: Sebastian Holtermann <sebholt@web.de>
Merge-request: !3324
Diffstat (limited to 'Source/cmMakefileTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileTargetGenerator.cxx | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Source/cmMakefileTargetGenerator.cxx b/Source/cmMakefileTargetGenerator.cxx index a751b24..e62b107 100644 --- a/Source/cmMakefileTargetGenerator.cxx +++ b/Source/cmMakefileTargetGenerator.cxx @@ -1430,7 +1430,7 @@ void cmMakefileTargetGenerator::AppendTargetDepends( } // Loop over all library dependencies. - const char* cfg = this->LocalGenerator->GetConfigName().c_str(); + const std::string& cfg = this->LocalGenerator->GetConfigName(); if (cmComputeLinkInformation* cli = this->GeneratorTarget->GetLinkInformation(cfg)) { std::vector<std::string> const& libDeps = cli->GetDepends(); @@ -1635,7 +1635,8 @@ void cmMakefileTargetGenerator::CreateLinkLibs( { std::string frameworkPath; std::string linkPath; - std::string config = this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); + const std::string& config = + this->Makefile->GetSafeDefinition("CMAKE_BUILD_TYPE"); cmComputeLinkInformation* pcli = this->GeneratorTarget->GetLinkInformation(config); this->LocalGenerator->OutputLinkLibraries(pcli, linkLineComputer, linkLibs, |