summaryrefslogtreecommitdiffstats
path: root/Source/cmMakefile.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-30 15:48:43 (GMT)
committerBrad King <brad.king@kitware.com>2020-12-15 12:00:53 (GMT)
commit15467f12f796205f97721f43ae7d9ee7cdc47466 (patch)
tree17fb00d71cb6698bd75a03b560faf7eeab557f6c /Source/cmMakefile.cxx
parent7b64b0cd5a4046bf8743c3e2d3c57cb470bfa95f (diff)
downloadCMake-15467f12f796205f97721f43ae7d9ee7cdc47466.zip
CMake-15467f12f796205f97721f43ae7d9ee7cdc47466.tar.gz
CMake-15467f12f796205f97721f43ae7d9ee7cdc47466.tar.bz2
cmLocalGenerator: Adopt custom target 'force' output name generation
Diffstat (limited to 'Source/cmMakefile.cxx')
-rw-r--r--Source/cmMakefile.cxx22
1 files changed, 2 insertions, 20 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 6743a89..028688d 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -1257,20 +1257,6 @@ void cmMakefile::AppendCustomCommandToOutput(
}
}
-std::string cmMakefile::GetUtilityOutput(cmTarget* target)
-{
- std::string force = cmStrCat(this->GetCurrentBinaryDirectory(),
- "/CMakeFiles/", target->GetName());
- // The output is not actually created so mark it symbolic.
- if (cmSourceFile* sf = this->GetOrCreateSource(
- force, false, cmSourceFileLocationKind::Known)) {
- sf->SetProperty("SYMBOLIC", "1");
- } else {
- cmSystemTools::Error("Could not get source file entry for " + force);
- }
- return force;
-}
-
cmTarget* cmMakefile::AddUtilityCommand(
const std::string& utilityName, bool excludeFromAll, const char* workingDir,
const std::vector<std::string>& byproducts,
@@ -1287,10 +1273,6 @@ cmTarget* cmMakefile::AddUtilityCommand(
return target;
}
- // Get the output name of the utility target and mark it generated.
- std::string force = this->GetUtilityOutput(target);
- this->GetOrCreateGeneratedSource(force);
-
// Always create the byproduct sources and mark them generated.
this->CreateGeneratedOutputs(byproducts);
@@ -1303,8 +1285,8 @@ cmTarget* cmMakefile::AddUtilityCommand(
[=](cmLocalGenerator& lg, const cmListFileBacktrace& lfbt) {
BacktraceGuard guard(this->Backtrace, lfbt);
detail::AddUtilityCommand(lg, lfbt, cmCommandOrigin::Project, target,
- force, GetCStrOrNull(workingStr), byproducts,
- depends, commandLines, escapeOldStyle,
+ GetCStrOrNull(workingStr), byproducts, depends,
+ commandLines, escapeOldStyle,
GetCStrOrNull(commentStr), uses_terminal,
command_expand_lists, job_pool, stdPipesUTF8);
});