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

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

Browse Source
This commit is contained in:
Sebastien Barre 2002-11-06 11:20:12 -05:00
parent bde5ee3f44
commit b8548c1db3
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
Source/cmMakeDepend.cxx
View File

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