diff options
| author | Brad King <brad.king@kitware.com> | 2008-07-07 14:05:29 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2008-07-07 14:05:29 (GMT) |
| commit | 97e658c571432757902f3333bb15aab90156dc9f (patch) | |
| tree | c720b5e15193373d6a8155f6fad284e7175c8821 | |
| parent | 7a10a8ca333ef7c84d19e313c6801ee0fe4bf689 (diff) | |
| download | CMake-97e658c571432757902f3333bb15aab90156dc9f.zip CMake-97e658c571432757902f3333bb15aab90156dc9f.tar.gz CMake-97e658c571432757902f3333bb15aab90156dc9f.tar.bz2 | |
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.
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 84d088f..b2afa7f 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -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()) << ":"; |