kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Handle last element outside of the loop. 

There is no point in checking on each loop iteration whether
it is the last element.
This commit is contained in:
Stephen Kelly 2015-01-23 01:03:45 +01:00
parent e21f7829a2
commit 0b61b86df8
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -2298,10 +2298,9 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
// Now add the rest of the components separated by the proper slash // Now add the rest of the components separated by the proper slash
// direction for this platform. // direction for this platform.
bool first = true; bool first = true;
for(unsigned int i=1; i < components.size(); ++i) for(unsigned int i=1; i < components.size() - 1; ++i)
{ {
// Only the last component can be empty to avoid double slashes. if(!components[i].empty())
if(!components[i].empty() || (i == (components.size()-1)))
{ {
if(!first) if(!first)
{ {
@ -2311,6 +2310,15 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
first = false; first = false;
} }
} }
if (components.size() > 1)
{
// Only the last component can be empty to avoid double slashes.
if(!first)
{
result += slash;
}
result += components.back();
}
} }
// Close the quoted result. // Close the quoted result.