Commit ef843428 authored by Brad King's avatar Brad King
Browse files

Remove old check for duplicate subdirectories

In cmMakefile::AddSubDirectory we were checking for addition of the same
source directory multiple times.  However, the check code was incorrect
because it compared pointers instetad of pointed-to strings.  Since the
check was written, a better check was added right after it to enforce
unique binary directories (in which case duplicate sources are fine).
This commit simply removes the old-style check code.
parent ab64fba4
......@@ -1539,21 +1539,6 @@ void cmMakefile::AddSubDirectory(const char* srcPath, const char *binPath,
bool excludeFromAll, bool preorder,
bool immediate)
{
std::vector<cmLocalGenerator *>& children =
this->LocalGenerator->GetChildren();
// has this directory already been added? If so error
unsigned int i;
for (i = 0; i < children.size(); ++i)
{
if (srcPath == children[i]->GetMakefile()->GetStartDirectory())
{
cmSystemTools::Error
("Attempt to add subdirectory multiple times for directory.\n",
srcPath);
return;
}
}
// Make sure the binary directory is unique.
if(!this->EnforceUniqueDir(srcPath, binPath))
{
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment