BUG: find files in subdirectories
This commit is contained in:
parent
d1b419b7be
commit
1b9a530ef4
@ -56,16 +56,17 @@ bool cmSourceFilesCommand::InitialPass(std::vector<std::string>& args)
|
|||||||
cmSourceFile file;
|
cmSourceFile file;
|
||||||
file.SetIsAnAbstractClass(false);
|
file.SetIsAnAbstractClass(false);
|
||||||
std::string path = cmSystemTools::GetFilenamePath(copy);
|
std::string path = cmSystemTools::GetFilenamePath(copy);
|
||||||
if (path == "")
|
// if this is a full path then
|
||||||
{
|
if((path.size() && path[0] == '/') ||
|
||||||
file.SetName(cmSystemTools::GetFilenameName(copy.c_str()).c_str(),
|
(path.size() > 1 && path[1] == ':'))
|
||||||
m_Makefile->GetCurrentDirectory());
|
|
||||||
}
|
|
||||||
else
|
|
||||||
{
|
{
|
||||||
file.SetName(cmSystemTools::GetFilenameName(copy.c_str()).c_str(),
|
file.SetName(cmSystemTools::GetFilenameName(copy.c_str()).c_str(),
|
||||||
path.c_str());
|
path.c_str());
|
||||||
}
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
file.SetName(i->c_str(), m_Makefile->GetCurrentDirectory());
|
||||||
|
}
|
||||||
m_Makefile->AddSource(file, args[0].c_str());
|
m_Makefile->AddSource(file, args[0].c_str());
|
||||||
}
|
}
|
||||||
return true;
|
return true;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user