"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "Source/cmVisualStudio10TargetGenerator.cxx" between
cmake-3.18.3.tar.gz and cmake-3.18.4.tar.gz

About: CMake is a cross-platform build system designed to build, test and package software.

cmVisualStudio10TargetGenerator.cxx  (cmake-3.18.3):cmVisualStudio10TargetGenerator.cxx  (cmake-3.18.4)
skipping to change at line 4930 skipping to change at line 4930
} }
} }
std::string cmVisualStudio10TargetGenerator::GetCSharpSourceLink( std::string cmVisualStudio10TargetGenerator::GetCSharpSourceLink(
cmSourceFile const* source) cmSourceFile const* source)
{ {
// For out of source files, we first check if a matching source group // For out of source files, we first check if a matching source group
// for this file exists, otherwise we check if the path relative to current // for this file exists, otherwise we check if the path relative to current
// source- or binary-dir is used within the link and return that // source- or binary-dir is used within the link and return that
std::string link; std::string link;
std::string sourceGroupedFile;
std::string const& fullFileName = source->GetFullPath(); std::string const& fullFileName = source->GetFullPath();
std::string const& srcDir = this->Makefile->GetCurrentSourceDirectory(); std::string const& srcDir = this->Makefile->GetCurrentSourceDirectory();
std::string const& binDir = this->Makefile->GetCurrentBinaryDirectory(); std::string const& binDir = this->Makefile->GetCurrentBinaryDirectory();
// unfortunately we have to copy the source groups, because // unfortunately we have to copy the source groups, because
// FindSourceGroup uses a regex which is modifying the group // FindSourceGroup uses a regex which is modifying the group
std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups(); std::vector<cmSourceGroup> sourceGroups = this->Makefile->GetSourceGroups();
cmSourceGroup* sourceGroup = cmSourceGroup* sourceGroup =
this->Makefile->FindSourceGroup(fullFileName, sourceGroups); this->Makefile->FindSourceGroup(fullFileName, sourceGroups);
if (sourceGroup && !sourceGroup->GetFullName().empty()) { if (sourceGroup && !sourceGroup->GetFullName().empty()) {
link = sourceGroup->GetFullName() + "/" + sourceGroupedFile = sourceGroup->GetFullName() + "/" +
cmsys::SystemTools::GetFilenameName(fullFileName); cmsys::SystemTools::GetFilenameName(fullFileName);
cmsys::SystemTools::ConvertToUnixSlashes(sourceGroupedFile);
}
if (!sourceGroupedFile.empty() &&
cmHasSuffix(fullFileName, sourceGroupedFile)) {
link = sourceGroupedFile;
} else if (cmHasPrefix(fullFileName, srcDir)) { } else if (cmHasPrefix(fullFileName, srcDir)) {
link = fullFileName.substr(srcDir.length() + 1); link = fullFileName.substr(srcDir.length() + 1);
} else if (cmHasPrefix(fullFileName, binDir)) { } else if (cmHasPrefix(fullFileName, binDir)) {
link = fullFileName.substr(binDir.length() + 1); link = fullFileName.substr(binDir.length() + 1);
} else if (cmProp l = source->GetProperty("VS_CSHARP_Link")) { } else if (cmProp l = source->GetProperty("VS_CSHARP_Link")) {
link = *l; link = *l;
} }
ConvertToWindowsSlash(link); ConvertToWindowsSlash(link);
return link; return link;
 End of changes. 3 change blocks. 
1 lines changed or deleted 8 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)