diff options
| author | Brad King <brad.king@kitware.com> | 2021-04-07 14:06:47 +0000 |
|---|---|---|
| committer | Kitware Robot <kwrobot@kitware.com> | 2021-04-07 10:06:56 -0400 |
| commit | 69685003529977860f1a1216373cc60ce7a3826e (patch) | |
| tree | 682bae7790a4cf4a00e9451ac781356fe0db6738 /Help | |
| parent | a1847844f0fe9b964c91fc5113222b5d5edfd554 (diff) | |
| parent | 4aed96e2309e64571aabfda263b3ca4c4f62d619 (diff) | |
| download | cmake-69685003529977860f1a1216373cc60ce7a3826e.tar.gz | |
Merge topic 'ios-rpath-linker-flag'
4aed96e230 Apple: Set CMAKE_SHARED_LIBRARY_RUNTIME_C_FLAG on non-macOS too
Acked-by: Kitware Robot <kwrobot@kitware.com>
Merge-request: !5980
Diffstat (limited to 'Help')
| -rw-r--r-- | Help/prop_tgt/INSTALL_NAME_DIR.rst | 8 | ||||
| -rw-r--r-- | Help/release/3.20.rst | 6 | ||||
| -rw-r--r-- | Help/variable/CMAKE_INSTALL_NAME_DIR.rst | 2 |
3 files changed, 12 insertions, 4 deletions
diff --git a/Help/prop_tgt/INSTALL_NAME_DIR.rst b/Help/prop_tgt/INSTALL_NAME_DIR.rst index 8faefb71c5..47a003774f 100644 --- a/Help/prop_tgt/INSTALL_NAME_DIR.rst +++ b/Help/prop_tgt/INSTALL_NAME_DIR.rst @@ -1,11 +1,13 @@ INSTALL_NAME_DIR ---------------- -macOS directory name for installed targets. +Directory name for installed targets on Apple platforms. ``INSTALL_NAME_DIR`` is a string specifying the directory portion of the -"install_name" field of shared libraries on macOS to use in the -installed targets. +"install_name" field of shared libraries on Apple platforms for +installed targets. When not set, the default directory used is determined +by :prop_tgt:`MACOSX_RPATH`. Policies :policy:`CMP0068` and :policy:`CMP0042` +are also relevant. This property is initialized by the value of the variable :variable:`CMAKE_INSTALL_NAME_DIR` if it is set when a target is diff --git a/Help/release/3.20.rst b/Help/release/3.20.rst index 9991eabfca..e452926be6 100644 --- a/Help/release/3.20.rst +++ b/Help/release/3.20.rst @@ -341,3 +341,9 @@ Changes made since CMake 3.20.0 include the following. and ``Intl_IS_BUILTIN``, but they were not implemented correctly. These have been removed and replaced with a single ``Intl_IS_BUILT_IN`` check, whose name is consistent with the :module:`FindIconv` module. + +* The ``-rpath`` linker flag is now specified as supported on all Apple + platforms, not just macOS. The ``install_name_dir`` used for + iOS, tvOS and watchOS should now default to ``@rpath`` instead of using + a full absolute path and failing at runtime when the library or framework + is embedded in an application bundle (see :prop_tgt:`XCODE_EMBED_<type>`). diff --git a/Help/variable/CMAKE_INSTALL_NAME_DIR.rst b/Help/variable/CMAKE_INSTALL_NAME_DIR.rst index 5ba4c04cbf..b07d44f687 100644 --- a/Help/variable/CMAKE_INSTALL_NAME_DIR.rst +++ b/Help/variable/CMAKE_INSTALL_NAME_DIR.rst @@ -1,7 +1,7 @@ CMAKE_INSTALL_NAME_DIR ---------------------- -macOS directory name for installed targets. +Directory name for installed targets on Apple platforms. ``CMAKE_INSTALL_NAME_DIR`` is used to initialize the :prop_tgt:`INSTALL_NAME_DIR` property on all targets. See that target |