From 15892aa3c0bd111dde2c15c9c10875d01c8acc2b Mon Sep 17 00:00:00 2001 From: Yoshinori Tahara Date: Fri, 3 Nov 2017 18:28:15 +0900 Subject: VS: Fix warnings in generated references to '.settings' files According to MSDN docs [1], LastGenOutput is just a file name. [1] https://msdn.microsoft.com/en-us/library/bb629388.aspx --- Source/cmVisualStudio10TargetGenerator.cxx | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx index 1aadf67..6486c8b 100644 --- a/Source/cmVisualStudio10TargetGenerator.cxx +++ b/Source/cmVisualStudio10TargetGenerator.cxx @@ -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"; -- cgit v0.12