From d2d1be06717cd0fd630ab478117ff84f958417ce Mon Sep 17 00:00:00 2001 From: Sebastian Maisch Date: Thu, 27 Oct 2022 03:29:37 -0400 Subject: VS: Fix paths in multi-target SDK-style projects Set the `AppendTargetFrameworkToOutputPath` property to `false` only for single target SDK-style projects. This prevents outputs from being overwritten during the build. This revises commit 7671d71299 (VS: Fix target output paths in SDK-style projects, 2022-09-23, v3.25.0-rc1~82^2). Fixes: #24094 Issue: #23989 --- Source/cmVisualStudio10TargetGenerator.cxx | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index c09eefa..4cfb561 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -903,7 +903,6 @@ void cmVisualStudio10TargetGenerator::WriteSdkStyleProjectFile( // of the IDE. e1.Element("VCProjectUpgraderObjectName", "NoUpgrade"); e1.Element("ManagedAssembly", "true"); - e1.Element("AppendTargetFrameworkToOutputPath", "false"); cmValue targetFramework = this->GeneratorTarget->GetProperty("DOTNET_TARGET_FRAMEWORK"); @@ -912,9 +911,11 @@ void cmVisualStudio10TargetGenerator::WriteSdkStyleProjectFile( e1.Element("TargetFrameworks", *targetFramework); } else { e1.Element("TargetFramework", *targetFramework); + e1.Element("AppendTargetFrameworkToOutputPath", "false"); } } else { e1.Element("TargetFramework", "net5.0"); + e1.Element("AppendTargetFrameworkToOutputPath", "false"); } std::string outputType; -- cgit v0.12