diff options
| author | Yoshinori Tahara <yossi-tahara@theolizer.com> | 2017-11-03 09:28:15 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2017-11-09 16:48:38 (GMT) |
| commit | 15892aa3c0bd111dde2c15c9c10875d01c8acc2b (patch) | |
| tree | a148c113fd673bdcf1a943f14b2f4c4827cba87c | |
| parent | 3d6e45af611983d85b130b4f874d862f7d998013 (diff) | |
| download | CMake-15892aa3c0bd111dde2c15c9c10875d01c8acc2b.zip CMake-15892aa3c0bd111dde2c15c9c10875d01c8acc2b.tar.gz CMake-15892aa3c0bd111dde2c15c9c10875d01c8acc2b.tar.bz2 | |
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
| -rw-r--r-- | Source/cmVisualStudio10TargetGenerator.cxx | 8 |
1 files 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"; |