[Cmake-commits] CMake branch, next, updated. v3.4.0-rc2-1198-g31e92e6
Brad King
brad.king at kitware.com
Fri Oct 30 09:10:03 EDT 2015
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".
The branch, next has been updated
via 31e92e6ea1fae6e3d360dbe49edf032f4efa4523 (commit)
via 9a7f042a955e814f66b8e468f934852ed53e0376 (commit)
from 20a2a98d7b2f61dd3ac74b7073a15ca84efb517d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=31e92e6ea1fae6e3d360dbe49edf032f4efa4523
commit 31e92e6ea1fae6e3d360dbe49edf032f4efa4523
Merge: 20a2a98 9a7f042
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 30 09:10:03 2015 -0400
Commit: CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Oct 30 09:10:03 2015 -0400
Merge topic 'doc-apple-info-plist-properties' into next
9a7f042a Help: Document target properties setting Info.plist fields (#15820)
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9a7f042a955e814f66b8e468f934852ed53e0376
commit 9a7f042a955e814f66b8e468f934852ed53e0376
Author: Brad King <brad.king at kitware.com>
AuthorDate: Fri Oct 30 09:04:52 2015 -0400
Commit: Brad King <brad.king at kitware.com>
CommitDate: Fri Oct 30 09:09:40 2015 -0400
Help: Document target properties setting Info.plist fields (#15820)
Format the documentation of MACOSX_{BUNDLE,FRAMEWORK}_INFO_PLIST and
specify for each property what field in the Info.plist file it sets.
diff --git a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
index 097cce1..07a933f 100644
--- a/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst
@@ -1,29 +1,35 @@
MACOSX_BUNDLE_INFO_PLIST
------------------------
-Specify a custom Info.plist template for a Mac OS X App Bundle.
+Specify a custom ``Info.plist`` template for a Mac OS X App Bundle.
-An executable target with MACOSX_BUNDLE enabled will be built as an
-application bundle on Mac OS X. By default its Info.plist file is
-created by configuring a template called MacOSXBundleInfo.plist.in
-located in the CMAKE_MODULE_PATH. This property specifies an
-alternative template file name which may be a full path.
+An executable target with :prop_tgt:`MACOSX_BUNDLE` enabled will be built as an
+application bundle on Mac OS X. By default its ``Info.plist`` file is created
+by configuring a template called ``MacOSXBundleInfo.plist.in`` located in the
+:variable:`CMAKE_MODULE_PATH`. This property specifies an alternative template
+file name which may be a full path.
The following target properties may be set to specify content to be
configured into the file:
-::
-
- MACOSX_BUNDLE_INFO_STRING
- MACOSX_BUNDLE_ICON_FILE
- MACOSX_BUNDLE_GUI_IDENTIFIER
- MACOSX_BUNDLE_LONG_VERSION_STRING
- MACOSX_BUNDLE_BUNDLE_NAME
- MACOSX_BUNDLE_SHORT_VERSION_STRING
- MACOSX_BUNDLE_BUNDLE_VERSION
- MACOSX_BUNDLE_COPYRIGHT
+``MACOSX_BUNDLE_BUNDLE_NAME``
+ Sets ``CFBundleName``.
+``MACOSX_BUNDLE_BUNDLE_VERSION``
+ Sets ``CFBundleVersion``.
+``MACOSX_BUNDLE_COPYRIGHT``
+ Sets ``NSHumanReadableCopyright``.
+``MACOSX_BUNDLE_GUI_IDENTIFIER``
+ Sets ``CFBundleIdentifier``.
+``MACOSX_BUNDLE_ICON_FILE``
+ Sets ``CFBundleIconFile``.
+``MACOSX_BUNDLE_INFO_STRING``
+ Sets ``CFBundleGetInfoString``.
+``MACOSX_BUNDLE_LONG_VERSION_STRING``
+ Sets ``CFBundleLongVersionString``.
+``MACOSX_BUNDLE_SHORT_VERSION_STRING``
+ Sets ``CFBundleShortVersionString``.
CMake variables of the same name may be set to affect all targets in a
directory that do not have each specific property set. If a custom
-Info.plist is specified by this property it may of course hard-code
+``Info.plist`` is specified by this property it may of course hard-code
all the settings instead of using the target properties.
diff --git a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
index 729d929..548c3ac 100644
--- a/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
+++ b/Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst
@@ -1,25 +1,27 @@
MACOSX_FRAMEWORK_INFO_PLIST
---------------------------
-Specify a custom Info.plist template for a Mac OS X Framework.
+Specify a custom ``Info.plist`` template for a Mac OS X Framework.
-A library target with FRAMEWORK enabled will be built as a framework
-on Mac OS X. By default its Info.plist file is created by configuring
-a template called MacOSXFrameworkInfo.plist.in located in the
-CMAKE_MODULE_PATH. This property specifies an alternative template
+A library target with :prop_tgt:`FRAMEWORK` enabled will be built as a
+framework on Mac OS X. By default its ``Info.plist`` file is created by
+configuring a template called ``MacOSXFrameworkInfo.plist.in`` located in the
+:variable:`CMAKE_MODULE_PATH`. This property specifies an alternative template
file name which may be a full path.
The following target properties may be set to specify content to be
configured into the file:
-::
-
- MACOSX_FRAMEWORK_ICON_FILE
- MACOSX_FRAMEWORK_IDENTIFIER
- MACOSX_FRAMEWORK_SHORT_VERSION_STRING
- MACOSX_FRAMEWORK_BUNDLE_VERSION
+``MACOSX_FRAMEWORK_BUNDLE_VERSION``
+ Sets ``CFBundleVersion``.
+``MACOSX_FRAMEWORK_ICON_FILE``
+ Sets ``CFBundleIconFile``.
+``MACOSX_FRAMEWORK_IDENTIFIER``
+ Sets ``CFBundleIdentifier``.
+``MACOSX_FRAMEWORK_SHORT_VERSION_STRING``
+ Sets ``CFBundleShortVersionString``.
CMake variables of the same name may be set to affect all targets in a
directory that do not have each specific property set. If a custom
-Info.plist is specified by this property it may of course hard-code
+``Info.plist`` is specified by this property it may of course hard-code
all the settings instead of using the target properties.
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/MACOSX_BUNDLE_INFO_PLIST.rst | 40 ++++++++++++++-----------
Help/prop_tgt/MACOSX_FRAMEWORK_INFO_PLIST.rst | 26 ++++++++--------
2 files changed, 37 insertions(+), 29 deletions(-)
hooks/post-receive
--
CMake
More information about the Cmake-commits
mailing list