summaryrefslogtreecommitdiffstats
path: root/Source/cmGeneratorExpressionEvaluationFile.cxx
diff options
context:
space:
mode:
authorJosef Angstenberger <code@jtxa.de>2020-08-01 01:21:42 (GMT)
committerBrad King <brad.king@kitware.com>2020-08-19 13:05:43 (GMT)
commit04fbd7566a67a773d17901b9bb3a9979efd3cdb4 (patch)
treefd684cf88a1811bb8092c432b1bd60b4d9b0cc3c /Source/cmGeneratorExpressionEvaluationFile.cxx
parent2dc2732f679d160ea954bf8903e5b7626096a2e8 (diff)
downloadCMake-04fbd7566a67a773d17901b9bb3a9979efd3cdb4.zip
CMake-04fbd7566a67a773d17901b9bb3a9979efd3cdb4.tar.gz
CMake-04fbd7566a67a773d17901b9bb3a9979efd3cdb4.tar.bz2
file(GENERATE): Fix missing check for policy CMP0070
In commit 82be694c7a (file(GENERATE): Add policy CMP0070 to define relative path behavior, 2017-06-08, v3.10.0-rc1~534^2), one path calculation was forgotten. Because of this the path name according to the old behavior was added to the list of CMake generated files. Fixes: #21038
Diffstat (limited to 'Source/cmGeneratorExpressionEvaluationFile.cxx')
-rw-r--r--Source/cmGeneratorExpressionEvaluationFile.cxx3
1 files changed, 1 insertions, 2 deletions
diff --git a/Source/cmGeneratorExpressionEvaluationFile.cxx b/Source/cmGeneratorExpressionEvaluationFile.cxx
index 667b4e6..6647e62 100644
--- a/Source/cmGeneratorExpressionEvaluationFile.cxx
+++ b/Source/cmGeneratorExpressionEvaluationFile.cxx
@@ -94,8 +94,7 @@ void cmGeneratorExpressionEvaluationFile::CreateOutputFile(
gg->GetEnabledLanguages(enabledLanguages);
for (std::string const& le : enabledLanguages) {
- std::string name = this->OutputFileExpr->Evaluate(lg, config, nullptr,
- nullptr, nullptr, le);
+ std::string const name = this->GetOutputFileName(lg, config, le);
cmSourceFile* sf = lg->GetMakefile()->GetOrCreateSource(
name, false, cmSourceFileLocationKind::Known);
// Tell TraceDependencies that the file is not expected to exist