[cmake-commits] andy committed cmGlobalXCodeGenerator.cxx 1.145 1.146

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv26099

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: fix for older xcode and framework create


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.145
retrieving revision 1.146
diff -u -d -r1.145 -r1.146
--- cmGlobalXCodeGenerator.cxx	9 May 2007 12:25:45 -0000	1.145
+++ cmGlobalXCodeGenerator.cxx	9 May 2007 14:28:32 -0000	1.146
@@ -1467,7 +1467,16 @@
     {
     // Get the install_name directory for the build tree.
     install_name_dir = target.GetInstallNameDirForBuildTree(configName);
-
+    if(target.GetPropertyAsBool("FRAMEWORK"))
+      {
+      if(install_name_dir.find(".framework") != install_name_dir.npos)
+        {
+        install_name_dir = install_name_dir + "/..";
+        install_name_dir = cmSystemTools::CollapseFullPath(install_name_dir.c_str());
+        std::cerr << "new install name " << install_name_dir << "\n";
+        }
+      }
+    
     if(install_name_dir.empty())
       {
       // Xcode will not pass the -install_name option at all if INSTALL_PATH