diff options
author | Brad King <brad.king@kitware.com> | 2017-04-28 18:30:00 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2017-05-01 14:33:05 (GMT) |
commit | d037be122e15fb3860869e07a0b6ccd8e7d4d94a (patch) | |
tree | daa5d00184619ee9ae07bc10181323a7e3b113d0 /Source/cmLocalGenerator.cxx | |
parent | b115bc49ff26da9db3e9238a98030fd94847d0d0 (diff) | |
download | CMake-d037be122e15fb3860869e07a0b6ccd8e7d4d94a.zip CMake-d037be122e15fb3860869e07a0b6ccd8e7d4d94a.tar.gz CMake-d037be122e15fb3860869e07a0b6ccd8e7d4d94a.tar.bz2 |
cmLocalGenerator: Add a hook for compiler flags used at link time
When using a compiler to drive linking we add compiler flags from
`CMAKE_<LANG>_FLAGS` in case they affect the way the compiler invokes
the linker, but we don't add flags from other places that are meant only
for compiling sources. Rather than calling the `AddLanguageFlags`
method (which is used to add flags for compiling sources) directly, add
an intermediate method that is used when adding the flags for linking.
This will give us a way to add language-specific compiler flags needed
when driving the linker in the same place on the command line as other
compiler flags go.
Diffstat (limited to 'Source/cmLocalGenerator.cxx')
-rw-r--r-- | Source/cmLocalGenerator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/cmLocalGenerator.cxx b/Source/cmLocalGenerator.cxx index 6c8f132..dd1b86f 100644 --- a/Source/cmLocalGenerator.cxx +++ b/Source/cmLocalGenerator.cxx @@ -1002,7 +1002,7 @@ void cmLocalGenerator::GetTargetFlags( target->GetName().c_str()); return; } - this->AddLanguageFlags(flags, target, linkLanguage, buildType); + this->AddLanguageFlagsForLinking(flags, target, linkLanguage, buildType); if (pcli) { this->OutputLinkLibraries(pcli, linkLineComputer, linkLibs, frameworkPath, linkPath); @@ -1317,6 +1317,13 @@ void cmLocalGenerator::AddLanguageFlags(std::string& flags, } } +void cmLocalGenerator::AddLanguageFlagsForLinking( + std::string& flags, cmGeneratorTarget const* target, const std::string& lang, + const std::string& config) +{ + this->AddLanguageFlags(flags, target, lang, config); +} + cmGeneratorTarget* cmLocalGenerator::FindGeneratorTargetToUse( const std::string& name) const { |