diff options
author | Brad King <brad.king@kitware.com> | 2009-09-17 12:25:33 (GMT) |
---|---|---|
committer | Brad King <brad.king@kitware.com> | 2009-09-17 12:25:33 (GMT) |
commit | ef8434284ff8126d2aa8d627aa9c7dd4d54a06ed (patch) | |
tree | 1d37d0a6b3d8cf4a934cca9d563c2fe5a30d0e77 /Source | |
parent | ab64fba44fb0703ea7ef369524c22c60bb0397f2 (diff) | |
download | CMake-ef8434284ff8126d2aa8d627aa9c7dd4d54a06ed.zip CMake-ef8434284ff8126d2aa8d627aa9c7dd4d54a06ed.tar.gz CMake-ef8434284ff8126d2aa8d627aa9c7dd4d54a06ed.tar.bz2 |
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.
Diffstat (limited to 'Source')
-rw-r--r-- | Source/cmMakefile.cxx | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx index 1ebf06e..a6b165a 100644 --- a/Source/cmMakefile.cxx +++ b/Source/cmMakefile.cxx @@ -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)) { |