diff options
| author | Brad King <brad.king@kitware.com> | 2017-11-10 12:49:52 (GMT) |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2017-11-10 12:50:00 (GMT) |
| commit | 78def0e25749249b500e8093e34df46217c526ef (patch) | |
| tree | 3c10ffc8ab11ad2edf69976ace485ed6b54a3929 /Source | |
| parent | 9aaf287d634db618c2961a063a3dda36d13d645b (diff) | |
| parent | 15892aa3c0bd111dde2c15c9c10875d01c8acc2b (diff) | |
| download | CMake-78def0e25749249b500e8093e34df46217c526ef.zip CMake-78def0e25749249b500e8093e34df46217c526ef.tar.gz CMake-78def0e25749249b500e8093e34df46217c526ef.tar.bz2 | |
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
Diffstat (limited to 'Source')
| -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"; |