From 95d6107da2678f0e27c4f50d3481b8c4b570cde9 Mon Sep 17 00:00:00 2001
From: Andy Cedilnik <andy.cedilnik@kitware.com>
Date: Fri, 11 Mar 2005 10:53:45 -0500
Subject: [PATCH] FIX: fix crashing test SubDir for xcode

---
 Source/cmGlobalXCodeGenerator.cxx | 59 ++++++++++++++++++++-----------
 Source/cmGlobalXCodeGenerator.h   |  1 +
 2 files changed, 39 insertions(+), 21 deletions(-)

diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 94b0080455..793d7c0520 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -168,6 +168,7 @@ void cmGlobalXCodeGenerator::Generate()
   for(it = m_ProjectMap.begin(); it!= m_ProjectMap.end(); ++it)
     { 
     cmLocalGenerator* root = it->second[0];
+    m_CurrentProject = root->GetMakefile()->GetProjectName();
     this->SetCurrentLocalGenerator(root);
     m_OutputDir = m_CurrentMakefile->GetHomeOutputDirectory();
     m_OutputDir = cmSystemTools::CollapseFullPath(m_OutputDir.c_str());
@@ -722,7 +723,7 @@ cmGlobalXCodeGenerator::AddCommandsToBuildPhase(cmXCodeObject* buildphase,
       for(std::vector<std::string>::const_iterator d = cc.GetDepends().begin();
           d != cc.GetDepends().end(); ++d)
         {
-        if(!this->FindTarget(m_CurrentMakefile->GetProjectName(),
+        if(!this->FindTarget(m_CurrentProject.c_str(),
                              d->c_str()))
           {
           makefileStream << "\\\n" << this
@@ -1216,7 +1217,7 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
   for(std::vector<cmStdString>::iterator lib = linkItems.begin();
       lib != linkItems.end(); ++lib)
     {
-    cmTarget* t = this->FindTarget(m_CurrentMakefile->GetProjectName(),
+    cmTarget* t = this->FindTarget(m_CurrentProject.c_str(),
                                    lib->c_str());
     cmXCodeObject* dptarget = this->FindXCodeTarget(t);
     if(dptarget)
@@ -1241,30 +1242,46 @@ void cmGlobalXCodeGenerator::AddDependAndLinkInformation(cmXCodeObject* target)
         = cmtarget->GetUtilities().begin();
       i != cmtarget->GetUtilities().end(); ++i)
     {
-    cmTarget* t = this->FindTarget(m_CurrentMakefile->GetProjectName(),
+    cmTarget* t = this->FindTarget(m_CurrentProject.c_str(),
                                    i->c_str());
-    cmXCodeObject* dptarget = this->FindXCodeTarget(t);
-    if(dptarget)
+    if(!t)
       {
-      this->AddDependTarget(target, dptarget);
+      std::string m = "Error Utility: ";
+      m += *i;
+      m += " not found in project ";
+      m += m_CurrentProject.c_str();
+      m += " it is a utility of ";
+      m += cmtarget->GetName();
+      cmSystemTools::Error(m.c_str());
       }
     else
       {
-      std::string m = "Error Utility: ";
-      m += i->c_str();
-      m += "\n";
-      m += "cmtarget ";
-      m += t->GetName();
-      m += "\n";
-      m += "Is on the target ";
-      m += cmtarget->GetName();
-      m += "\n";
-      m += "But it has no xcode target created yet??\n";
-      m += "Current project is ";
-      m += m_CurrentMakefile->GetProjectName();
-      cmSystemTools::Error(m.c_str());
-      }
-    } 
+      cmXCodeObject* dptarget = this->FindXCodeTarget(t);
+      if(dptarget)
+        {
+        this->AddDependTarget(target, dptarget);
+        }
+      else
+        {
+        std::string m = "Error Utility: ";
+        m += i->c_str();
+        m += "\n";
+        m += "cmtarget ";
+        if(t)
+          {
+          m += t->GetName();
+          }
+        m += "\n";
+        m += "Is on the target ";
+        m += cmtarget->GetName();
+        m += "\n";
+        m += "But it has no xcode target created yet??\n";
+        m += "Current project is ";
+        m += m_CurrentProject.c_str();
+        cmSystemTools::Error(m.c_str());
+        }
+      } 
+    }
   std::vector<cmStdString> fullPathLibs;
   orderLibs.GetFullPathLibraries(fullPathLibs);
   for(std::vector<cmStdString>::iterator i = fullPathLibs.begin();
diff --git a/Source/cmGlobalXCodeGenerator.h b/Source/cmGlobalXCodeGenerator.h
index fe68f2845d..6cf7d2d092 100644
--- a/Source/cmGlobalXCodeGenerator.h
+++ b/Source/cmGlobalXCodeGenerator.h
@@ -143,6 +143,7 @@ private:
   bool m_DoneXCodeHack;
   std::string m_CurrentReRunCMakeMakefile;
   std::string m_CurrentXCodeHackMakefile;
+  std::string m_CurrentProject;
   std::string m_OutputDir; 
   std::vector<std::string> m_CurrentOutputDirectoryComponents;
   std::vector<std::string> m_ProjectOutputDirectoryComponents;