From 04fbd7566a67a773d17901b9bb3a9979efd3cdb4 Mon Sep 17 00:00:00 2001 From: Josef Angstenberger Date: Sat, 1 Aug 2020 03:21:42 +0200 Subject: 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 --- Source/cmGeneratorExpressionEvaluationFile.cxx | 3 +-- 1 file changed, 1 insertion(+), 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 -- cgit v0.12