Merge topic 'csharp-settings-property'

15892aa3 VS: Fix warnings in generated references to '.settings' files

Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !1450
This commit is contained in:
Brad King
2017-11-10 12:49:52 +00:00
committed by Kitware Robot
+2 -6
View File
@@ -1689,12 +1689,8 @@ void cmVisualStudio10TargetGenerator::WriteExtraSource(cmSourceFile const* sf)
} else if (ext == "natvis") {
tool = "Natvis";
} else if (ext == "settings") {
// remove path to current source dir (if files are in current source dir)
if (!sourceLink.empty()) {
settingsLastGenOutput = sourceLink;
} else {
settingsLastGenOutput = sf->GetFullPath();
}
settingsLastGenOutput =
cmsys::SystemTools::GetFilenameName(sf->GetFullPath());
std::size_t pos = settingsLastGenOutput.find(".settings");
settingsLastGenOutput.replace(pos, 9, ".Designer.cs");
settingsGenerator = "SettingsSingleFileGenerator";