ENH: Cleanup building of OS X bundle content

 - Fixes repeated rebuild of bundles by Makefile generators
 - Add special rules to copy sources to their
   MACOSX_PACKAGE_LOCATION bundle directory
 - Remove MacOSX_Content language hack
   - Remove EXTRA_CONTENT property
   - Remove MACOSX_CONTENT
   - Remove corresponding special cases in object names

1 files changed, 9 insertions, 18 deletions

diff --git a/Source/cmSourceFile.cxx b/Source/cmSourceFile.cxx
index da2664f..4aaba43 100644
--- a/Source/cmSourceFile.cxx
+++ b/Source/cmSourceFile.cxx
@@ -422,13 +422,6 @@ void cmSourceFile::DefineProperties(cmake *cm)
      "It will still be linked into the target though.");
 
   cm->DefineProperty
-    ("EXTRA_CONTENT", cmProperty::SOURCE_FILE, 
-     "Is this file part of a target's extra content.",
-     "If this property is set, the source file will be added to the "
-     "target's list of extra content. This is used by makefile "
-     "generators for some sort of Mac budle framework support.");
-
-  cm->DefineProperty
     ("GENERATED", cmProperty::SOURCE_FILE, 
      "Is this source file generated as part of the build process.",
      "If a source file is generated by the build process CMake will "
@@ -467,17 +460,15 @@ void cmSourceFile::DefineProperties(cmake *cm)
 
   cm->DefineProperty
     ("MACOSX_PACKAGE_LOCATION", cmProperty::SOURCE_FILE, 
-     "Location for MACOSX bundles and frameworks.",
-     "MACOSX_PACKAGE_LOCATION is the property of a file within a mac osx "
-     "bundle or framework that specifies where this file should be "
-     "copied. This makes sense for things like icons and other "
-     "resources.");
-
-  cm->DefineProperty
-    ("MACOSX_CONTENT", cmProperty::SOURCE_FILE, 
-     "If true then this is part of a MACOSX bundle or framework.",
-     "MACOSX_CONTENT is a flag that if true this file will be copied "
-     "to the bundle or framework.");
+     "Place a source file inside a Mac OS X application bundle.",
+     "Executable targets with the MACOSX_BUNDLE property set are built "
+     "as Mac OS X application bundles on Apple platforms.  "
+     "Source files specified for the target with the "
+     "MACOSX_PACKAGE_LOCATION property set will be placed in the "
+     "application bundle Contents folder under the directory specified "
+     "by the value of the property.  "
+     "Typically this is set to \"Resources\" for icon files and other "
+     "bundle resources.");
 
   cm->DefineProperty
     ("OBJECT_DEPENDS", cmProperty::SOURCE_FILE,