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

ENH: When nor specifying full path, make sure it actually works, on broken filesystems fix case of files.

Browse Source
This commit is contained in:
Andy Cedilnik 2004-02-06 15:26:15 -05:00
parent 9c744cfe35
commit 31c1071ebf
1 changed files with 18 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Source/cmGlob.cxx
View File

@ -163,6 +163,7 @@ void cmGlob::RecurseDirectory(const std::string& dir, bool dir_only)
} }
unsigned long cc; unsigned long cc;
std::string fullname; std::string fullname;
std::string realname;
std::string fname; std::string fname;
for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ ) for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ )
{ {
@ -173,6 +174,8 @@ void cmGlob::RecurseDirectory(const std::string& dir, bool dir_only)
continue; continue;
} }
realname = dir + "/" + fname;
#if defined( CM_GLOB_CASE_INDEPENDENT ) #if defined( CM_GLOB_CASE_INDEPENDENT )
// On Windows and apple, no difference between lower and upper case // On Windows and apple, no difference between lower and upper case
fname = cmsys::SystemTools::LowerCase(fname); fname = cmsys::SystemTools::LowerCase(fname);
@ -210,6 +213,7 @@ void cmGlob::ProcessDirectory(std::string::size_type start,
} }
unsigned long cc; unsigned long cc;
std::string fullname; std::string fullname;
std::string realname;
std::string fname; std::string fname;
for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ ) for ( cc = 0; cc < d.GetNumberOfFiles(); cc ++ )
{ {
@ -220,6 +224,15 @@ void cmGlob::ProcessDirectory(std::string::size_type start,
continue; continue;
} }
if ( start == 0 )
{
realname = dir + fname;
}
else
{
realname = dir + "/" + fname;
}
#if defined( CM_GLOB_CASE_INDEPENDENT ) #if defined( CM_GLOB_CASE_INDEPENDENT )
// On Windows and apple, no difference between lower and upper case // On Windows and apple, no difference between lower and upper case
fname = cmsys::SystemTools::LowerCase(fname); fname = cmsys::SystemTools::LowerCase(fname);
@ -247,11 +260,11 @@ void cmGlob::ProcessDirectory(std::string::size_type start,
{ {
if ( last ) if ( last )
{ {
m_Internals->Files.push_back(fullname); m_Internals->Files.push_back(realname);
} }
else else
{ {
this->ProcessDirectory(start+1, fullname + "/", dir_only); this->ProcessDirectory(start+1, realname + "/", dir_only);
} }
} }
} }
@ -271,6 +284,7 @@ bool cmGlob::FindFiles(const std::string& inexpr)
expr = cmsys::SystemTools::GetCurrentWorkingDirectory(); expr = cmsys::SystemTools::GetCurrentWorkingDirectory();
expr += "/" + inexpr; expr += "/" + inexpr;
} }
std::string fexpr = expr;
int skip = 0; int skip = 0;
int last_slash = 0; int last_slash = 0;
@ -289,7 +303,7 @@ bool cmGlob::FindFiles(const std::string& inexpr)
} }
if ( last_slash > 0 ) if ( last_slash > 0 )
{ {
//std::cout << "I can skip: " << inexpr.substr(0, last_slash) << std::endl; //std::cout << "I can skip: " << fexpr.substr(0, last_slash) << std::endl;
skip = last_slash; skip = last_slash;
} }
if ( skip == 0 ) if ( skip == 0 )
@ -351,7 +365,7 @@ bool cmGlob::FindFiles(const std::string& inexpr)
// Handle network paths // Handle network paths
if ( skip > 0 ) if ( skip > 0 )
{ {
this->ProcessDirectory(0, inexpr.substr(0, skip) + "/", this->ProcessDirectory(0, fexpr.substr(0, skip) + "/",
true); true);
} }
else else