summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2018-12-13 15:02:54 (GMT)
committerKitware Robot <kwrobot@kitware.com>2018-12-13 15:03:00 (GMT)
commited1c375c05e09997c9ffafc739fb6d3c1dca5c27 (patch)
tree25c5ed4a86ad684ed5d4fccf4931467b76fed6db
parent6589f67fb725df68836646ab1e30f496d58f9e36 (diff)
parentea3d60cffaa3761f258ff1bea4ba6f589cae7ad7 (diff)
downloadCMake-ed1c375c05e09997c9ffafc739fb6d3c1dca5c27.zip
CMake-ed1c375c05e09997c9ffafc739fb6d3c1dca5c27.tar.gz
CMake-ed1c375c05e09997c9ffafc739fb6d3c1dca5c27.tar.bz2
Merge topic 'vs-csharp-ref-dot'
ea3d60cffa VisualStudio10TargetGenerator: support C# refs with '.' in file name. Acked-by: Kitware Robot <kwrobot@kitware.com> Merge-request: !2729
-rw-r--r--Source/cmVisualStudio10TargetGenerator.cxx3
1 files changed, 2 insertions, 1 deletions
diff --git a/Source/cmVisualStudio10TargetGenerator.cxx b/Source/cmVisualStudio10TargetGenerator.cxx
index 7d7defc..667e40b 100644
--- a/Source/cmVisualStudio10TargetGenerator.cxx
+++ b/Source/cmVisualStudio10TargetGenerator.cxx
@@ -723,7 +723,8 @@ void cmVisualStudio10TargetGenerator::WriteDotNetReferences(Elem& e0)
// if the entry from VS_DOTNET_REFERENCES is an existing file, generate
// a new hint-reference and name it from the filename
if (cmsys::SystemTools::FileExists(ri, true)) {
- std::string name = cmsys::SystemTools::GetFilenameWithoutExtension(ri);
+ std::string name =
+ cmsys::SystemTools::GetFilenameWithoutLastExtension(ri);
std::string path = ri;
ConvertToWindowsSlash(path);
this->DotNetHintReferences[""].push_back(