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.
This commit is contained in:
parent
7a10a8ca33
commit
97e658c571
|
@ -2579,9 +2579,14 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
|
|||
t->GetType() == cmTarget::SHARED_LIBRARY ||
|
||||
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(
|
||||
t->GetFullPath(configName).c_str());
|
||||
this->ConvertToRelativeForMake(tfull.c_str());
|
||||
}
|
||||
}
|
||||
makefileStream << "\n\n";
|
||||
|
@ -2637,6 +2642,11 @@ cmGlobalXCodeGenerator::CreateXCodeDependHackTarget(
|
|||
{
|
||||
// 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())
|
||||
<< ":";
|
||||
|
||||
|
|
Loading…
Reference in New Issue