summaryrefslogtreecommitdiff
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2016-08-01 14:59:44 -0400
committerCMake Topic Stage <kwrobot@kitware.com>2016-08-01 14:59:44 -0400
commit2711c35a8d42e43c7600ef23bf586f2e068292e8 (patch)
treedc46e76d164b085495bebe7718eb16b000b7ea6b /Help
parent8427b8e11c9a98fb7f7875a1153ab4998e61d4c1 (diff)
parentf951d0adb4f7ca185804fba530a3dbc9b81f1cc5 (diff)
downloadcmake-2711c35a8d42e43c7600ef23bf586f2e068292e8.tar.gz
Merge topic 'app-framework-bundle-extension'
f951d0ad Add tests for BUNDLE_EXTENSION c63380b1 Update documentation about bundle extensions 134d5c1f Honor BUNDLE_EXTENSION also for Frameworks (#14742) 2b909c08 Honor BUNDLE_EXTENSION also for App Bundles (#16148)
Diffstat (limited to 'Help')
-rw-r--r--Help/prop_tgt/BUNDLE_EXTENSION.rst7
-rw-r--r--Help/release/dev/app-framework-bundle-extension.rst5
2 files changed, 9 insertions, 3 deletions
diff --git a/Help/prop_tgt/BUNDLE_EXTENSION.rst b/Help/prop_tgt/BUNDLE_EXTENSION.rst
index ea265b373f..6b3d58023c 100644
--- a/Help/prop_tgt/BUNDLE_EXTENSION.rst
+++ b/Help/prop_tgt/BUNDLE_EXTENSION.rst
@@ -1,7 +1,8 @@
BUNDLE_EXTENSION
----------------
-The file extension used to name a :prop_tgt:`BUNDLE` target on the OS X and iOS.
+The file extension used to name a :prop_tgt:`BUNDLE`, a :prop_tgt:`FRAMEWORK`,
+or a :prop_tgt:`MACOSX_BUNDLE` target on the OS X and iOS.
-The default value is ``bundle`` - you can also use ``plugin`` or whatever
-file extension is required by the host app for your bundle.
+The default value is ``bundle``, ``framework``, or ``app`` for the respective
+target types.
diff --git a/Help/release/dev/app-framework-bundle-extension.rst b/Help/release/dev/app-framework-bundle-extension.rst
new file mode 100644
index 0000000000..01855a2b07
--- /dev/null
+++ b/Help/release/dev/app-framework-bundle-extension.rst
@@ -0,0 +1,5 @@
+app-framework-bundle-extension
+------------------------------
+
+* On Apple platforms the :prop_tgt:`BUNDLE_EXTENSION` now also applies to
+ Frameworks and App Bundles.