diff options
author | Craig Scott <craig.scott@crascit.com> | 2024-01-01 00:29:28 (GMT) |
---|---|---|
committer | Kitware Robot <kwrobot@kitware.com> | 2024-01-01 00:29:44 (GMT) |
commit | 581c2b624010844fa676a45267d9ca2faf09b5e7 (patch) | |
tree | 90b19d9767c3f0dccd47fe2edfedf2900f5c8258 /Help/manual | |
parent | aea1365e6f347f96d2a07423b0313f846a8dad50 (diff) | |
parent | 315cf740253215ea958a7fb2792f2bcb05d49fd4 (diff) | |
download | CMake-581c2b624010844fa676a45267d9ca2faf09b5e7.zip CMake-581c2b624010844fa676a45267d9ca2faf09b5e7.tar.gz CMake-581c2b624010844fa676a45267d9ca2faf09b5e7.tar.bz2 |
Merge topic 'doc-toolchains-apple'
315cf74025 Help: Note CMAKE_IOS_INSTALL_COMBINED deprecation in toolchains example
af2e4379fc Help: Fix typo not accounting for addition of visionOS
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !9112
Diffstat (limited to 'Help/manual')
-rw-r--r-- | Help/manual/cmake-toolchains.7.rst | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/Help/manual/cmake-toolchains.7.rst b/Help/manual/cmake-toolchains.7.rst index e32bd29..1ebdf85 100644 --- a/Help/manual/cmake-toolchains.7.rst +++ b/Help/manual/cmake-toolchains.7.rst @@ -583,7 +583,7 @@ generator is recommended. The :generator:`Unix Makefiles` or :generator:`Ninja` generators can also be used, but they require the project to handle more areas like target CPU selection and code signing. -Any of the three systems can be targeted by setting the +Any of the Apple device platforms can be targeted by setting the :variable:`CMAKE_SYSTEM_NAME` variable to a value from the table below. By default, the latest Device SDK is chosen. As for all Apple platforms, a different SDK (e.g. a simulator) can be selected by setting the @@ -611,9 +611,11 @@ Variable :variable:`CMAKE_OSX_ARCHITECTURES` can be used to set architectures for both device and simulator. Variable :variable:`CMAKE_OSX_DEPLOYMENT_TARGET` can be used to set an iOS/tvOS/visionOS/watchOS deployment target. -Next configuration will install fat 5 architectures iOS library -and add the ``-miphoneos-version-min=9.3``/``-mios-simulator-version-min=9.3`` -flags to the compiler: +The next example installs five architectures in a universal binary for an iOS +library. It adds the relevant ``-miphoneos-version-min=9.3`` or +``-mios-simulator-version-min=9.3`` compiler flag where appropriate. +Note that the :variable:`CMAKE_IOS_INSTALL_COMBINED` variable used in the +example is now deprecated, so this approach is no longer recommended. .. code-block:: console |