mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-01-09 15:20:56 -06:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Add GetTargetCompileFlags overload with backtraces

Browse Source
This commit is contained in:
Justin Goshi
2019-09-03 10:25:44 -07:00
committed by Brad King
parent 8e973b8e8d
commit 291c83f063
2 changed files with 17 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
Source/cmLocalGenerator.cxx
View File

@@ -1382,6 +1382,16 @@ void cmLocalGenerator::GetTargetCompileFlags(cmGeneratorTarget* target,
std::string const& lang,
std::string& flags)
{
std::vector<BT<std::string>> tmpFlags =
this->GetTargetCompileFlags(target, config, lang);
this->AppendFlags(flags, tmpFlags);
}
std::vector<BT<std::string>> cmLocalGenerator::GetTargetCompileFlags(
cmGeneratorTarget* target, std::string const& config,
std::string const& lang)
{
std::vector<BT<std::string>> flags;
std::string compileFlags;
cmMakefile* mf = this->GetMakefile();
@@ -1406,9 +1416,11 @@ void cmLocalGenerator::GetTargetCompileFlags(cmGeneratorTarget* target,
this->AppendFlags(compileFlags,
this->GetFrameworkFlags(lang, config, target));
flags = std::move(compileFlags);
if (!compileFlags.empty()) {
flags.emplace_back(std::move(compileFlags));
}
this->AddCompileOptions(flags, target, lang, config);
return flags;
}
static std::string GetFrameworkFlags(const std::string& lang,

3
Source/cmLocalGenerator.h
View File

@@ -397,6 +397,9 @@ public:
void GetTargetCompileFlags(cmGeneratorTarget* target,
std::string const& config,
std::string const& lang, std::string& flags);
std::vector<BT<std::string>> GetTargetCompileFlags(cmGeneratorTarget* target,
std::string const& config,
std::string const& lang);
std::string GetFrameworkFlags(std::string const& l,
std::string const& config,