[Cmake-commits] [cmake-commits] king committed cmMakefile.cxx 1.520 1.521
cmake-commits at cmake.org
cmake-commits at cmake.org
Thu Sep 17 08:25:36 EDT 2009
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv10395/Source
Modified Files:
cmMakefile.cxx
Log Message:
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.
Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.520
retrieving revision 1.521
diff -C 2 -d -r1.520 -r1.521
*** cmMakefile.cxx 16 Sep 2009 13:51:47 -0000 1.520
--- cmMakefile.cxx 17 Sep 2009 12:25:33 -0000 1.521
***************
*** 1540,1558 ****
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))
--- 1540,1543 ----
More information about the Cmake-commits
mailing list