[Cmake-commits] [cmake-commits] king committed cmGlobalXCodeGenerator.cxx 1.191 1.192

[cmake-commits at cmake.org]

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

Modified Files:
	cmGlobalXCodeGenerator.cxx 
Log Message:
BUG: Fix AppBundle=>Library depends in Xcode

  - The Xcode generator xcode-depend-helper needs to account
    for the paths of executables within application bundles.
  - See bug #7278.


Index: cmGlobalXCodeGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalXCodeGenerator.cxx,v
retrieving revision 1.191
retrieving revision 1.192
diff -C 2 -d -r1.191 -r1.192
*** cmGlobalXCodeGenerator.cxx	3 Jul 2008 17:28:54 -0000	1.191
--- cmGlobalXCodeGenerator.cxx	7 Jul 2008 14:05:29 -0000	1.192
***************
*** 2580,2586 ****
           t->GetType() == cmTarget::MODULE_LIBRARY)
          {
          makefileStream << "\\\n\t" <<
!           this->ConvertToRelativeForMake(
!             t->GetFullPath(configName).c_str());
          }
        }
--- 2580,2591 ----
           t->GetType() == cmTarget::MODULE_LIBRARY)
          {
+         std::string tfull = t->GetFullPath(configName);
+         if(t->IsAppBundleOnApple())
+           {
+           tfull += ".app/Contents/MacOS/";
+           tfull += t->GetFullName(configName);
+           }
          makefileStream << "\\\n\t" <<
!           this->ConvertToRelativeForMake(tfull.c_str());
          }
        }
***************
*** 2638,2641 ****
--- 2643,2651 ----
          // Create a rule for this target.
          std::string tfull = t->GetFullPath(configName);
+         if(t->IsAppBundleOnApple())
+           {
+           tfull += ".app/Contents/MacOS/";
+           tfull += t->GetFullName(configName);
+           }
          makefileStream << this->ConvertToRelativeForMake(tfull.c_str()) 
                         << ":";