summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2022-10-28 13:58:42 (GMT)
committerKitware Robot <kwrobot@kitware.com>2022-10-28 13:58:52 (GMT)
commit4910efb178b0b309c341e53bc197d6a6644fa0ac (patch)
tree22a6bddab1a89a28b8c2816707d15cb8845325de
parent5d12374b512fe9d69e4cf4eafdad4ea5c441e899 (diff)
parentd2d1be06717cd0fd630ab478117ff84f958417ce (diff)
downloadCMake-4910efb178b0b309c341e53bc197d6a6644fa0ac.zip
CMake-4910efb178b0b309c341e53bc197d6a6644fa0ac.tar.gz
CMake-4910efb178b0b309c341e53bc197d6a6644fa0ac.tar.bz2
Merge topic 'vs-dotnet-sdk-output-paths' into release-3.25
d2d1be0671 VS: Fix paths in multi-target SDK-style projects Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !7836
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx3
1 files changed, 2 insertions, 1 deletions
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;