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

Subdirs reports an error if the subdirectory does not exists

Browse Source
This commit is contained in:
Andy Cedilnik 2002-10-24 10:58:25 -04:00
parent 384fda81a9
commit e3e9fb633a
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
Source/cmSubdirCommand.cxx
View File

@ -26,12 +26,25 @@ bool cmSubdirCommand::InitialPass(std::vector<std::string> const& argsIn)
} }
std::vector<std::string> args; std::vector<std::string> args;
cmSystemTools::ExpandListArguments(argsIn, args); cmSystemTools::ExpandListArguments(argsIn, args);
bool res = true;
for(std::vector<std::string>::const_iterator i = args.begin(); for(std::vector<std::string>::const_iterator i = args.begin();
i != args.end(); ++i) i != args.end(); ++i)
{ {
m_Makefile->AddSubDirectory(i->c_str()); std::string directory = std::string(m_Makefile->GetCurrentDirectory()) +
"/" + i->c_str();
if ( cmSystemTools::FileIsDirectory(directory.c_str()) )
{
m_Makefile->AddSubDirectory(i->c_str());
}
else
{
std::string error = "Incorrect SUBDIRS command. Directory: ";
error += directory + " does not exists.";
this->SetError(error.c_str());
res = false;
}
} }
return true; return res;
} }