summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalXCodeGenerator.cxx
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2013-06-04 13:02:46 (GMT)
committerCMake Topic Stage <kwrobot@kitware.com>2013-06-04 13:02:46 (GMT)
commit05e47f21222f0c14735ce1431a74a5ad974cb1a2 (patch)
tree1ad5af2b4247cd4feeeb08a0f7f01194ef3bb8b5 /Source/cmGlobalXCodeGenerator.cxx
parentb418327d1b85944d137913faf6c04537b5894e2f (diff)
parent483e208482ff46532e7ae48659e569580a88af9c (diff)
downloadCMake-05e47f21222f0c14735ce1431a74a5ad974cb1a2.zip
CMake-05e47f21222f0c14735ce1431a74a5ad974cb1a2.tar.gz
CMake-05e47f21222f0c14735ce1431a74a5ad974cb1a2.tar.bz2
Merge topic 'cfbundle-location'
483e208 OS X: Fix getting of CFBundle LOCATION property.
Diffstat (limited to 'Source/cmGlobalXCodeGenerator.cxx')
-rw-r--r--Source/cmGlobalXCodeGenerator.cxx8
1 files changed, 1 insertions, 7 deletions
diff --git a/Source/cmGlobalXCodeGenerator.cxx b/Source/cmGlobalXCodeGenerator.cxx
index 2d76c82..a3e8cc4 100644
--- a/Source/cmGlobalXCodeGenerator.cxx
+++ b/Source/cmGlobalXCodeGenerator.cxx
@@ -750,12 +750,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.
//
@@ -1880,7 +1874,7 @@ void cmGlobalXCodeGenerator::CreateBuildSettings(cmTarget& target,
pndir = target.GetDirectory(configName);
}
- if(target.IsFrameworkOnApple())
+ if(target.IsFrameworkOnApple() || target.IsCFBundleOnApple())
{
pnprefix = "";
}