summaryrefslogtreecommitdiffstats
path: root/Source/cmLocalUnixMakefileGenerator3.cxx
diff options
context:
space:
mode:
Diffstat (limited to 'Source/cmLocalUnixMakefileGenerator3.cxx')
-rw-r--r--Source/cmLocalUnixMakefileGenerator3.cxx14
1 files changed, 11 insertions, 3 deletions
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx b/Source/cmLocalUnixMakefileGenerator3.cxx
index 54d330f..32da821 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -2298,10 +2298,9 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
// Now add the rest of the components separated by the proper slash
// direction for this platform.
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() || (i == (components.size()-1)))
+ if(!components[i].empty())
{
if(!first)
{
@@ -2311,6 +2310,15 @@ cmLocalUnixMakefileGenerator3::ConvertToQuotedOutputPath(const char* p,
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.