[cmake-commits] hoffman committed cmGlobalXCodeGenerator.cxx 1.143 1.144

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
ENH: getting closer 


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.143
retrieving revision 1.144
diff -u -d -r1.143 -r1.144
--- cmGlobalXCodeGenerator.cxx	8 May 2007 19:49:54 -0000	1.143
+++ cmGlobalXCodeGenerator.cxx	8 May 2007 20:37:18 -0000	1.144
@@ -2623,10 +2623,22 @@
     {
     if(config)
       {
-
-      dir += prefix;
-      dir += config;
-      dir += suffix;
+      if(dir.find(".framework") != dir.npos)
+        {
+        std::string::size_type pos = dir.rfind("/");
+        std::string framework = dir.substr(pos);
+        std::string newDir;
+        newDir = dir.substr(0, pos);
+        newDir += "/";
+        newDir += config;
+        dir = newDir;
+        }
+      else
+        {
+        dir += prefix;
+        dir += config;
+        dir += suffix;
+        }
       }
     }
 }