Explorar o código

allow the same subdir to be added twice

Ken Martin %!s(int64=23) %!d(string=hai) anos
pai
achega
2f927a538b
Modificáronse 1 ficheiros con 6 adicións e 1 borrados
  1. 6 1
      Source/cmMakefile.cxx

+ 6 - 1
Source/cmMakefile.cxx

@@ -570,7 +570,12 @@ void cmMakefile::AddLinkDirectory(const char* dir)
 
 void cmMakefile::AddSubDirectory(const char* sub)
 {
-  m_SubDirectories.push_back(sub);
+  // make sure it isn't already there
+  if (std::find(m_SubDirectories.begin(),
+                m_SubDirectories.end(), sub) == m_SubDirectories.end())  
+    {
+    m_SubDirectories.push_back(sub);
+    }
 }
 
 void cmMakefile::AddIncludeDirectory(const char* inc, bool before)