mirror/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2026-04-29 18:51:05 -05:00
Code Issues Packages Projects Releases Wiki Activity

cmLocalGenerator: Add GetStaticLibraryFlags 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 1f6a436bf4
commit 4d5bbb7704
2 changed files with 26 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Source/cmLocalGenerator.cxx
+23 -4
View File
@@ -1148,8 +1148,18 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
std::string const& linkLanguage, std::string const& linkLanguage,
cmGeneratorTarget* target) cmGeneratorTarget* target)
{ {
std::string staticLibFlags; std::vector<BT<std::string>> tmpFlags =
this->GetStaticLibraryFlags(config, linkLanguage, target);
this->AppendFlags(flags, tmpFlags);
}
std::vector<BT<std::string>> cmLocalGenerator::GetStaticLibraryFlags(
std::string const& config, std::string const& linkLanguage,
cmGeneratorTarget* target)
{
std::vector<BT<std::string>> flags;
if (linkLanguage != "Swift") { if (linkLanguage != "Swift") {
std::string staticLibFlags;
this->AppendFlags( this->AppendFlags(
staticLibFlags, staticLibFlags,
this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS")); this->Makefile->GetSafeDefinition("CMAKE_STATIC_LINKER_FLAGS"));
@@ -1158,7 +1168,12 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
this->AppendFlags(staticLibFlags, this->AppendFlags(staticLibFlags,
this->Makefile->GetSafeDefinition(name)); this->Makefile->GetSafeDefinition(name));
} }
if (!staticLibFlags.empty()) {
flags.emplace_back(std::move(staticLibFlags));
}
} }
std::string staticLibFlags;
this->AppendFlags(staticLibFlags, this->AppendFlags(staticLibFlags,
target->GetSafeProperty("STATIC_LIBRARY_FLAGS")); target->GetSafeProperty("STATIC_LIBRARY_FLAGS"));
if (!config.empty()) { if (!config.empty()) {
@@ -1166,12 +1181,16 @@ void cmLocalGenerator::GetStaticLibraryFlags(std::string& flags,
this->AppendFlags(staticLibFlags, target->GetSafeProperty(name)); this->AppendFlags(staticLibFlags, target->GetSafeProperty(name));
} }
flags = std::move(staticLibFlags); if (!staticLibFlags.empty()) {
flags.emplace_back(std::move(staticLibFlags));
}
std::vector<std::string> staticLibOpts; std::vector<BT<std::string>> staticLibOpts =
target->GetStaticLibraryLinkOptions(staticLibOpts, config, linkLanguage); target->GetStaticLibraryLinkOptions(config, linkLanguage);
// STATIC_LIBRARY_OPTIONS are escaped. // STATIC_LIBRARY_OPTIONS are escaped.
this->AppendCompileOptions(flags, staticLibOpts); this->AppendCompileOptions(flags, staticLibOpts);
return flags;
} }
void cmLocalGenerator::GetTargetFlags( void cmLocalGenerator::GetTargetFlags(
Source/cmLocalGenerator.h
+3
View File
@@ -371,6 +371,9 @@ public:
void GetStaticLibraryFlags(std::string& flags, std::string const& config, void GetStaticLibraryFlags(std::string& flags, std::string const& config,
std::string const& linkLanguage, std::string const& linkLanguage,
cmGeneratorTarget* target); cmGeneratorTarget* target);
std::vector<BT<std::string>> GetStaticLibraryFlags(
std::string const& config, std::string const& linkLanguage,
cmGeneratorTarget* target);
/** Fill out these strings for the given target. Libraries to link, /** Fill out these strings for the given target. Libraries to link,
* flags, and linkflags. */ * flags, and linkflags. */