summaryrefslogtreecommitdiffstats
path: root/Help
diff options
context:
space:
mode:
authorBrad King <brad.king@kitware.com>2023-11-16 14:13:02 (GMT)
committerKitware Robot <kwrobot@kitware.com>2023-11-16 14:13:16 (GMT)
commit2c923a7e28d668a193cd5e444c1f6c4a995d544a (patch)
tree59c41b2ab38a78cebd7fd0c951aab22ded994658 /Help
parentf6d65c622c40ed0f7b0da9d8b17aa22c203fd48c (diff)
parent37bc3400cd5abd2e9f34a9da726dcffed709f9d4 (diff)
downloadCMake-2c923a7e28d668a193cd5e444c1f6c4a995d544a.zip
CMake-2c923a7e28d668a193cd5e444c1f6c4a995d544a.tar.gz
CMake-2c923a7e28d668a193cd5e444c1f6c4a995d544a.tar.bz2
Merge topic 'install-export-xcframework'
37bc3400cd CMakePackageConfigHelpers: Add generate_apple_platform_selection_file() 256bb0cc40 install(EXPORT): Add ability to point to .xcframework file a90968e044 cmExportBuildFileGenerator: Add structs for target exports Acked-by: Kitware Robot <kwrobot@kitware.com> Acked-by: Jason Juang <jasjuang@gmail.com> Merge-request: !8969
Diffstat (limited to 'Help')
-rw-r--r--Help/command/export.rst13
-rw-r--r--Help/release/dev/install-export-xcframework.rst9
2 files changed, 22 insertions, 0 deletions
diff --git a/Help/command/export.rst b/Help/command/export.rst
index 0440c50..f190df7 100644
--- a/Help/command/export.rst
+++ b/Help/command/export.rst
@@ -170,6 +170,9 @@ Configuring Exports
[ENABLED (<bool-true>|<bool-false>|AUTO)]
[EXTRA_ARGS <args>...]
] [...]
+ [TARGET <target>
+ [XCFRAMEWORK_LOCATION <location>]
+ ] [...]
)
.. versionadded:: 3.29
@@ -202,3 +205,13 @@ Configure the parameters of an export. The arguments are as follows:
``EXTRA_ARGS <args>``
Specify additional arguments to pass to :command:`find_dependency` after
the ``REQUIRED`` argument.
+
+``TARGET <target>``
+ Specify a target to configure in this export. This argument accepts the
+ following additional arguments:
+
+ ``XCFRAMEWORK_LOCATION``
+ Specify the location of an ``.xcframework`` which contains the library from
+ this target. If specified, the generated code will check to see if the
+ ``.xcframework`` exists, and if it does, it will use the ``.xcframework``
+ as its imported location instead of the installed library.
diff --git a/Help/release/dev/install-export-xcframework.rst b/Help/release/dev/install-export-xcframework.rst
new file mode 100644
index 0000000..513a552
--- /dev/null
+++ b/Help/release/dev/install-export-xcframework.rst
@@ -0,0 +1,9 @@
+install-export-xcframework
+--------------------------
+
+* The :command:`export(SETUP)` command gained a new ``XCFRAMEWORK_LOCATION``
+ argument, which can be used to specify the location of a ``.xcframework``
+ that can be substituted for the installed library.
+* The :module:`CMakePackageConfigHelpers` module gained a new
+ :command:`generate_apple_platform_selection_file` function, which can be
+ used to generate a file that includes another Apple-platform-specific file.