diff options
| author | Clinton Stimpson <clinton@elemtech.com> | 2013-06-02 04:47:18 (GMT) |
|---|---|---|
| committer | Clinton Stimpson <clinton@elemtech.com> | 2013-06-03 12:29:33 (GMT) |
| commit | 483e208482ff46532e7ae48659e569580a88af9c (patch) | |
| tree | fe9d3910326c45e9df4c4129de5daa02a81e3e3c /Source/cmGlobalXCodeGenerator.cxx | |
| parent | 373faae5e1c936351b143b0561c61ef9884303e1 (diff) | |
| download | CMake-483e208482ff46532e7ae48659e569580a88af9c.zip CMake-483e208482ff46532e7ae48659e569580a88af9c.tar.gz CMake-483e208482ff46532e7ae48659e569580a88af9c.tar.bz2 | |
OS X: Fix getting of CFBundle LOCATION property.
This fixes bug #13797.
The kinds of changes applied in 373faae5 for frameworks are now
applied to CFBundle. The prefix and suffix for CFBundles are
now handled in cmTarget::GetFullNameInternal.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
| -rw-r--r-- | Source/cmGlobalXCodeGenerator.cxx | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx index 240d60c..00a06bc 100644 --- a/Source/cmGlobalXCodeGenerator.cxx +++ b/Source/cmGlobalXCodeGenerator.cxx @@ -746,12 +746,6 @@ cmGlobalXCodeGenerator::CreateXCodeSourceFile(cmLocalGenerator* lg, } } - if(cmtarget.IsCFBundleOnApple()) - { - cmtarget.SetProperty("PREFIX", ""); - cmtarget.SetProperty("SUFFIX", ""); - } - // Add the fileRef to the top level Resources group/folder if it is not // already there. // @@ -1823,7 +1817,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target, pndir = target.GetDirectory(configName); } - if(target.IsFrameworkOnApple()) + if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple()) { pnprefix = ""; } |