diff options
| author | Marc Chevrier <marc.chevrier@gmail.com> | 2018-04-26 08:11:50 (GMT) |
|---|---|---|
| committer | Marc Chevrier <marc.chevrier@gmail.com> | 2018-06-06 15:02:33 (GMT) |
| commit | 8e28d2630a60475dad715162a1802d301ada35bd (patch) | |
| tree | 1c9f7c687ecfb7535240bd41933388191a144e66 /Source/cmMakefileExecutableTargetGenerator.cxx | |
| parent | 074bb25ca05e095fd8efef9ed0b3b9f9771bf624 (diff) | |
| download | CMake-8e28d2630a60475dad715162a1802d301ada35bd.zip CMake-8e28d2630a60475dad715162a1802d301ada35bd.tar.gz CMake-8e28d2630a60475dad715162a1802d301ada35bd.tar.bz2 | |
Makefile generator: link flags management refactoring
Diffstat (limited to 'Source/cmMakefileExecutableTargetGenerator.cxx')
| -rw-r--r-- | Source/cmMakefileExecutableTargetGenerator.cxx | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/Source/cmMakefileExecutableTargetGenerator.cxx b/Source/cmMakefileExecutableTargetGenerator.cxx index 1e59f44..9ffffc2 100644 --- a/Source/cmMakefileExecutableTargetGenerator.cxx +++ b/Source/cmMakefileExecutableTargetGenerator.cxx @@ -154,12 +154,7 @@ void cmMakefileExecutableTargetGenerator::WriteDeviceExecutableRule( linkLanguage, this->ConfigName); // Add target-specific linker flags. - this->LocalGenerator->AppendFlags( - linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS")); - std::string linkFlagsConfig = "LINK_FLAGS_"; - linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName); - this->LocalGenerator->AppendFlags( - linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig)); + this->GetTargetLinkFlags(linkFlags); // Construct a list of files associated with this executable that // may need to be cleaned. @@ -437,12 +432,7 @@ void cmMakefileExecutableTargetGenerator::WriteExecutableRule(bool relink) linkLanguage, this->ConfigName); // Add target-specific linker flags. - this->LocalGenerator->AppendFlags( - linkFlags, this->GeneratorTarget->GetProperty("LINK_FLAGS")); - std::string linkFlagsConfig = "LINK_FLAGS_"; - linkFlagsConfig += cmSystemTools::UpperCase(this->ConfigName); - this->LocalGenerator->AppendFlags( - linkFlags, this->GeneratorTarget->GetProperty(linkFlagsConfig)); + this->GetTargetLinkFlags(linkFlags); { std::unique_ptr<cmLinkLineComputer> linkLineComputer( |