Kitware/CMake
1
0
Fork 0
mirror of https://github.com/Kitware/CMake.git synced 2025-10-16 22:37:30 +08:00
Code Issues Projects Releases Wiki Activity

cmLocalGenerator: Refactor UpdateOutputToSourceMap to avoid boolean trap

Browse Source
This commit is contained in:
Brad King
2020-10-16 09:40:30 -04:00
parent e4034eabe9
commit 1902d28ebc
2 changed files with 17 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmLocalGenerator.cxx
View File

@@ -3924,7 +3924,9 @@ cmSourceFile* AddCustomCommand(
cc->SetJobPool(job_pool);
file->SetCustomCommand(std::move(cc));
lg.AddSourceOutputs(file, outputs, byproducts);
lg.AddSourceOutputs(file, outputs, cmLocalGenerator::OutputRole::Primary);
lg.AddSourceOutputs(file, byproducts,
cmLocalGenerator::OutputRole::Byproduct);
}
return file;
}
@@ -4177,13 +4179,10 @@ void cmLocalGenerator::AddTargetByproducts(
void cmLocalGenerator::AddSourceOutputs(
cmSourceFile* source, const std::vector<std::string>& outputs,
const std::vector<std::string>& byproducts)
OutputRole role)
{
for (std::string const& o : outputs) {
this->UpdateOutputToSourceMap(o, source, false);
}
for (std::string const& o : byproducts) {
this->UpdateOutputToSourceMap(o, source, true);
this->UpdateOutputToSourceMap(o, source, role);
}
}
@@ -4211,18 +4210,18 @@ void cmLocalGenerator::UpdateOutputToSourceMap(std::string const& byproduct,
void cmLocalGenerator::UpdateOutputToSourceMap(std::string const& output,
cmSourceFile* source,
bool byproduct)
OutputRole role)
{
SourceEntry entry;
entry.Sources.Source = source;
entry.Sources.SourceIsByproduct = byproduct;
entry.Sources.SourceIsByproduct = role == OutputRole::Byproduct;
auto pr = this->OutputToSource.emplace(output, entry);
if (!pr.second) {
SourceEntry& current = pr.first->second;
// Outputs take precedence over byproducts
if (!current.Sources.Source ||
(current.Sources.SourceIsByproduct && !byproduct)) {
(current.Sources.SourceIsByproduct && role == OutputRole::Primary)) {
current.Sources.Source = source;
current.Sources.SourceIsByproduct = false;
} else {

12
Source/cmLocalGenerator.h
View File

@@ -368,12 +368,18 @@ public:
void AddTargetByproducts(cmTarget* target,
const std::vector<std::string>& byproducts);
enum class OutputRole
{
Primary,
Byproduct,
};
/**
* Add source file outputs.
*/
void AddSourceOutputs(cmSourceFile* source,
const std::vector<std::string>& outputs,
const std::vector<std::string>& byproducts);
std::vector<std::string> const& outputs,
OutputRole role);
/**
* Return the target if the provided source name is a byproduct of a utility
@@ -609,7 +615,7 @@ private:
void UpdateOutputToSourceMap(std::string const& byproduct, cmTarget* target);
void UpdateOutputToSourceMap(std::string const& output, cmSourceFile* source,
bool byproduct);
OutputRole role);
void AddSharedFlags(std::string& flags, const std::string& lang,
bool shared);