summaryrefslogtreecommitdiffstats
path: root/Source/cmCustomCommandGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2020-10-16 13:55:54 (GMT)
committerBrad King <brad.king@kitware.com>2020-12-10 12:06:21 (GMT)
commit947ba01bf987bce09c2fdd5e2547f79af2c5844b (patch)
tree953be58128f912a1e472e8eca5a51b6b772d10ee /Source/cmCustomCommandGenerator.cxx
parent1902d28ebc50ee93acb1be2320b79f2e844f7f41 (diff)
downloadCMake-947ba01bf987bce09c2fdd5e2547f79af2c5844b.zip
CMake-947ba01bf987bce09c2fdd5e2547f79af2c5844b.tar.gz
CMake-947ba01bf987bce09c2fdd5e2547f79af2c5844b.tar.bz2
cmLocalGenerator: Factor out helper to expand custom command output paths
Diffstat (limited to 'Source/cmCustomCommandGenerator.cxx')
-rw-r--r--Source/cmCustomCommandGenerator.cxx6
1 files changed, 1 insertions, 5 deletions
diff --git a/Source/cmCustomCommandGenerator.cxx b/Source/cmCustomCommandGenerator.cxx
index cc0419d..64cd88e 100644
--- a/Source/cmCustomCommandGenerator.cxx
+++ b/Source/cmCustomCommandGenerator.cxx
@@ -53,11 +53,7 @@ std::vector<std::string> EvaluateOutputs(std::vector<std::string> const& paths,
std::vector<std::string> outputs;
for (std::string const& p : paths) {
std::unique_ptr<cmCompiledGeneratorExpression> cge = ge.Parse(p);
- std::string const& ep = cge->Evaluate(lg, config);
- cm::append(outputs, cmExpandedList(ep));
- }
- for (std::string& p : outputs) {
- p = cmSystemTools::CollapseFullPath(p, lg->GetCurrentBinaryDirectory());
+ cm::append(outputs, lg->ExpandCustomCommandOutputPaths(*cge, config));
}
return outputs;
}