From 0d48ea69842d16fad63cc8ac0bfc42bbb7eb11ef Mon Sep 17 00:00:00 2001
From: Alexander Neundorf <neundorf@kde.org>
Date: Sun, 11 Jan 2009 12:18:44 -0500
Subject: [PATCH] ENH: patch from Miguel, As it is today the generator creates
 linked resources to LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH if they
 are not a subdirectory of the binary dir, so that the IDE can detect the
 Binaries (this was addressed previously as a result of a bug report).

Reduces code redundancy by encapsulating common behaviour for
LIBRARY_OUTPUT_PATH and EXECUTABLE_OUTPUT_PATH in AppendLinkedResource.

Addresses the two new variable names for these locations,
CMAKE_LIBRARY_OUTPUT_DIRECTORY and CMAKE_RUNTIME_OUTPUT_DIRECTORY respectively.

Finally, it is addressing a bug in the current code for relative paths
in these variables. If it is a relative path to the binary dir, the
IsSubdirectory call returns false and so it creates the linked
resource. The created linked resource produces an error in the Eclipse
IDE because the IDE expects it to be a full path. The patch now
addresses this by concatenating the binary dir if it is a relative
path.
---
 Source/cmExtraEclipseCDT4Generator.cxx | 88 ++++++++++++++++----------
 Source/cmExtraEclipseCDT4Generator.h   |  4 ++
 2 files changed, 58 insertions(+), 34 deletions(-)

diff --git a/Source/cmExtraEclipseCDT4Generator.cxx b/Source/cmExtraEclipseCDT4Generator.cxx
index 7ecf3c105..bdf4edc59 100644
--- a/Source/cmExtraEclipseCDT4Generator.cxx
+++ b/Source/cmExtraEclipseCDT4Generator.cxx
@@ -380,42 +380,14 @@ void cmExtraEclipseCDT4Generator::CreateProjectFile()
         }
       }
     // for EXECUTABLE_OUTPUT_PATH when not in binary dir
-    std::string outputPath = mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH");
-    if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
-                        outputPath.c_str(), this->HomeOutputDirectory.c_str()))
-      {
-      std::string name = this->GetPathBasename(outputPath);
-
-      // make sure linked resource name is unique
-      while (this->GlobalGenerator->GetProjectMap().find(name)
-             != this->GlobalGenerator->GetProjectMap().end())
-        {
-        name += "_";
-        }
-        this->AppendLinkedResource(fout, name,
-                                   this->GetEclipsePath(outputPath));
-        this->OutLinkedResources.push_back(name);
-      }
+    this->AppendOutLinkedResource(fout,
+      mf->GetSafeDefinition("CMAKE_RUNTIME_OUTPUT_DIRECTORY"),
+      mf->GetSafeDefinition("EXECUTABLE_OUTPUT_PATH"));
     // for LIBRARY_OUTPUT_PATH when not in binary dir
-    if (outputPath != mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"))
-      {
-      outputPath = mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH");
-      if (!outputPath.empty() && !cmSystemTools::IsSubDirectory(
-                        outputPath.c_str(), this->HomeOutputDirectory.c_str()))
-        {
-        std::string name = this->GetPathBasename(outputPath);
+    this->AppendOutLinkedResource(fout,
+      mf->GetSafeDefinition("CMAKE_LIBRARY_OUTPUT_DIRECTORY"),
+      mf->GetSafeDefinition("LIBRARY_OUTPUT_PATH"));
 
-        // make sure linked resource name is unique
-        while (this->GlobalGenerator->GetProjectMap().find(name)
-               != this->GlobalGenerator->GetProjectMap().end())
-          {
-          name += "_";
-          }
-        this->AppendLinkedResource(fout, name,
-                                   this->GetEclipsePath(outputPath));
-        this->OutLinkedResources.push_back(name);
-        }
-      }
     fout << "\t</linkedResources>\n";
     }
 
@@ -936,3 +908,51 @@ 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));
+    this->OutLinkedResources.push_back(name);
+    return true;
+    }
+}
+
diff --git a/Source/cmExtraEclipseCDT4Generator.h b/Source/cmExtraEclipseCDT4Generator.h
index 955d0aae3..0898b7668 100644
--- a/Source/cmExtraEclipseCDT4Generator.h
+++ b/Source/cmExtraEclipseCDT4Generator.h
@@ -107,6 +107,10 @@ private:
                                     const std::string&     name,
                                     const std::string&     path);
 
+  bool AppendOutLinkedResource(cmGeneratedFileStream& fout,
+                               const std::string&     defname,
+                               const std::string&     altdefname);
+
   std::vector<std::string> SrcLinkedResources;
   std::vector<std::string> OutLinkedResources;
   std::string HomeDirectory;