1 files changed, 20 insertions, 75 deletions

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 78a87047a..96b8a0920 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -462,18 +462,6 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
     this->CreateLinksForTargets(fout);
     }
 
-  // I'm not sure this makes too much sense. There can be different
-  // output directories in different subdirs, so we would need more of them.
-
-  // for EXECUTABLE_OUTPUT_PATH when not in binary dir
-  this->AppendOutLinkedResource(fout,
-    mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY"),
-    mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"));
-  // for LIBRARY_OUTPUT_PATH when not in binary dir
-  this->AppendOutLinkedResource(fout,
-    mf->GetSafeDefinition("CMAKE_LIBRARY_OUTPUT_DIRECTORY"),
-    mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"));
-
   fout << "\t</linkedResources>\n";
 
   fout << "</projectDescription>\n";
@@ -610,6 +598,16 @@ void cmExtraEclipseCDT4Generator::AppendIncludeDirectories(
     if (!inc->empty())
       {
       std::string dir = cmSystemTools::CollapseFullPath(inc->c_str());
+
+      // handle framework include dirs on OSX, the remainder after the
+      // Frameworks/ part has to be stripped
+      //   /System/Library/Frameworks/GLUT.framework/Headers
+      cmsys::RegularExpression frameworkRx("(.+/Frameworks)/.+\\.framework/");
+      if(frameworkRx.find(dir.c_str()))
+        {
+        dir = frameworkRx.match(1);
+        }
+
       if(emittedDirs.find(dir) == emittedDirs.end())
         {
         emittedDirs.insert(dir);
@@ -761,18 +759,6 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
   excludeFromOut += "**/CMakeFiles/";
   fout << "<pathentry excluding=\"" << excludeFromOut
        << "\" kind=\"out\" path=\"\"/>\n";
-  // add output entry for EXECUTABLE_OUTPUT_PATH and LIBRARY_OUTPUT_PATH
-  // - if it is a subdir of homeOutputDirectory, there is no need to add it
-  // - if it is not then create a linked resource and add the linked name
-  //   but check it doesn't conflict with other linked resources names
-  for (std::vector<std::string>::const_iterator
-       it = this->OutLinkedResources.begin();
-       it != this->OutLinkedResources.end();
-       ++it)
-    {
-    fout << "<pathentry kind=\"out\" path=\"" << this->EscapeForXML(*it)
-         << "\"/>\n";
-    }
 
   // add pre-processor definitions to allow eclipse to gray out sections
   emmited.clear();
@@ -898,11 +884,18 @@ void cmExtraEclipseCDT4Generator::CreateCProjectFile() const
        it != this->GlobalGenerator->GetLocalGenerators().end();
        ++it)
     {
-    cmTargets & targets = (*it)->GetMakefile()->GetTargets();
-    for (cmTargets::iterator l = targets.begin(); l != targets.end(); ++l)
+    cmGeneratorTargetsType targets = (*it)->GetMakefile()
+                                        ->GetGeneratorTargets();
+    for (cmGeneratorTargetsType::iterator l = targets.begin();
+         l != targets.end(); ++l)
       {
+      if (l->first->IsImported())
+        {
+        continue;
+        }
       std::vector<std::string> includeDirs;
-      (*it)->GetIncludeDirectories(includeDirs, &l->second);
+      const char *config = mf->GetDefinition("CMAKE_BUILD_TYPE");
+      (*it)->GetIncludeDirectories(includeDirs, l->second, "C", config);
       this->AppendIncludeDirectories(fout, includeDirs, emmited);
       }
     }
@@ -1317,51 +1310,3 @@ void cmExtraEclipseCDT4Generator
     "\t\t</link>\n"
     ;
 }
-
-bool cmExtraEclipseCDT4Generator
-::AppendOutLinkedResource(cmGeneratedFileStream& fout,
-                          const std::string&     defname,
-                          const std::string&     altdefname)
-{
-  if (defname.empty() && altdefname.empty())
-    {
-    return false;
-    }
-
-  std::string outputPath = (defname.empty() ? altdefname : defname);
-
-  if (!cmSystemTools::FileIsFullPath(outputPath.c_str()))
-    {
-    outputPath = this->HomeOutputDirectory + "/" + outputPath;
-    }
-  if (cmSystemTools::IsSubDirectory(outputPath.c_str(),
-                                    this->HomeOutputDirectory.c_str()))
-    {
-    return false;
-    }
-
-  std::string name = this->GetPathBasename(outputPath);
-
-  // make sure linked resource name is unique
-  while (this->GlobalGenerator->GetProjectMap().find(name)
-      != this->GlobalGenerator->GetProjectMap().end())
-    {
-    name += "_";
-    }
-
-  if (std::find(this->OutLinkedResources.begin(),
-                this->OutLinkedResources.end(),
-                name)
-      != this->OutLinkedResources.end())
-    {
-    return false;
-    }
-  else
-    {
-    this->AppendLinkedResource(fout, name,
-                               this->GetEclipsePath(outputPath), LinkToFolder);
-    this->OutLinkedResources.push_back(name);
-    return true;
-    }
-}
-