Make search paths ordered and unique

Avoid duplicates. Same as before the introduction of the INCLUDE_DIRECTORIES
target property.

1 files changed, 14 insertions, 1 deletions

diff --git a/Source/cmMakeDepend.cxx b/Source/cmMakeDepend.cxx
index 03fe33d..6055c55 100644
--- a/Source/cmMakeDepend.cxx
+++ b/Source/cmMakeDepend.cxx
@@ -56,6 +56,8 @@ void cmMakeDepend::SetMakefile(cmMakefile* makefile)
     this->Makefile->ComplainFileRegularExpression.c_str());
 
   // Now extract any include paths from the targets
+  std::set<std::string> uniqueIncludes;
+  std::vector<std::string> orderedAndUniqueIncludes;
   cmTargets & targets = this->Makefile->GetTargets();
   for (cmTargets::iterator l = targets.begin(); l != targets.end(); ++l)
     {
@@ -66,9 +68,20 @@ void cmMakeDepend::SetMakefile(cmMakefile* makefile)
       {
       std::string path = *j;
       this->Makefile->ExpandVariablesInString(path);
-      this->AddSearchPath(path.c_str());
+      if(uniqueIncludes.insert(path).second)
+        {
+        orderedAndUniqueIncludes.push_back(path);
+        }
       }
     }
+
+  for(std::vector<std::string>::const_iterator
+    it = orderedAndUniqueIncludes.begin();
+    it != orderedAndUniqueIncludes.end();
+    ++it)
+    {
+    this->AddSearchPath(it->c_str());
+    }
 }