summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2017-03-31 14:39:59 (GMT)
committerKitware Robot <kwrobot@kitware.com>2017-03-31 14:40:02 (GMT)
commitc791fb12544926bc5870a61735dc2ec62940a6f6 (patch)
treef4cfb4a96b5a855e259240511530425b38ff01fb /Help
parent4a553ecb8e52dfd3ca605cd94ef8033e5febe937 (diff)
parentd1dac1acc502af2f2b766cc9b262a4f1294be39b (diff)
downloadCMake-c791fb12544926bc5870a61735dc2ec62940a6f6.zip
CMake-c791fb12544926bc5870a61735dc2ec62940a6f6.tar.gz
CMake-c791fb12544926bc5870a61735dc2ec62940a6f6.tar.bz2
Merge topic '16733-bundle-genex'
d1dac1ac Xcode: Execute RunCMake.Framework also for Xcode generator d02709d7 Genex: Add `TARGET_BUNDLE_[CONTENT_]_DIR` generator expressions 013ffe76 cmGeneratorTarget: Call GetFrameworkDirectory in GetFullNameInternal 32e9d0ca cmGeneratorTarget: Use enum to describe bundle directory query level Acked-by: Kitware Robot <kwrobot@kitware.com> Reviewed-by: Craig Scott <craig.scott@crascit.com> Merge-request: !635
Diffstat (limited to 'Help')
-rw-r--r--Help/manual/cmake-generator-expressions.7.rst9
-rw-r--r--Help/release/dev/bundle-genex.rst12
2 files changed, 21 insertions, 0 deletions
diff --git a/Help/manual/cmake-generator-expressions.7.rst b/Help/manual/cmake-generator-expressions.7.rst
index 3a225ad..645be1d 100644
--- a/Help/manual/cmake-generator-expressions.7.rst
+++ b/Help/manual/cmake-generator-expressions.7.rst
@@ -205,6 +205,15 @@ Available informational expressions are:
Name of the linker generated program database file (.pdb).
``$<TARGET_PDB_FILE_DIR:tgt>``
Directory of the linker generated program database file (.pdb).
+``$<TARGET_BUNDLE_DIR:tgt>``
+ Full path to the bundle directory (``my.app``, ``my.framework``, or
+ ``my.bundle``) where ``tgt`` is the name of a target.
+``$<TARGET_BUNDLE_CONTENT_DIR:tgt>``
+ Full path to the bundle content directory where ``tgt`` is the name of a
+ target. For the macOS SDK it leads to ``my.app/Contents``, ``my.framework``,
+ or ``my.bundle/Contents``. For all other SDKs (e.g. iOS) it leads to
+ ``my.app``, ``my.framework``, or ``my.bundle`` due to the flat bundle
+ structure.
``$<TARGET_PROPERTY:tgt,prop>``
Value of the property ``prop`` on the target ``tgt``.
diff --git a/Help/release/dev/bundle-genex.rst b/Help/release/dev/bundle-genex.rst
new file mode 100644
index 0000000..e79b84c
--- /dev/null
+++ b/Help/release/dev/bundle-genex.rst
@@ -0,0 +1,12 @@
+bundle-genex
+------------
+
+* Two new informational generator expressions to retrieve Apple Bundle
+ directories have been added. The first one ``$<TARGET_BUNDLE_DIR:tgt>``
+ outputs the full path to the Bundle directory, the other one
+ ``$<TARGET_BUNDLE_CONTENT_DIR:tgt>`` outputs the full path to the
+ ``Contents`` directory of macOS Bundles and App Bundles. For all other
+ bundle types and SDKs it is identical with ``$<TARGET_BUNDLE_DIR:tgt>``.
+
+ Those new expressions are helpful to query Bundle locations independent of
+ the different Bundle types and layouts on macOS and iOS.