FIX: a / was appended without checking if there wasn't one already.

1 files changed, 12 insertions, 3 deletions

diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
index 1864504..a5ba60b 100644
--- a/Source/cmMakeDepend.cxx
+++ b/Source/cmMakeDepend.cxx
@@ -159,7 +159,10 @@ void cmMakeDepend::GenerateDependInformation(cmDependInformation* info)
             t != m_IncludeDirectories.end(); ++t)
           {
           std::string incpath = *t;
-          incpath = incpath + "/";
+          if (incpath.size() && incpath[incpath.size() - 1] != '/')
+            {
+            incpath = incpath + "/";
+            }
           incpath = incpath + path;
           if (srcFile->GetFullPath() == incpath)
             {
@@ -302,7 +305,10 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
       i != m_IncludeDirectories.end(); ++i)
     {
     std::string path = *i;
-    path = path + "/";
+    if (path.size() && path[path.size() - 1] != '/')
+      {
+      path = path + "/";
+      }
     path = path + fname;
     if(cmSystemTools::FileExists(path.c_str()))
       {
@@ -313,7 +319,10 @@ std::string cmMakeDepend::FullPath(const char* fname, const char *extraPath)
   if (extraPath)
     {
     std::string path = extraPath;
-    path = path + "/";
+    if (path.size() && path[path.size() - 1] != '/')
+      {
+      path = path + "/";
+      }
     path = path + fname;
     if(cmSystemTools::FileExists(path.c_str()))
       {