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  63966e13c4b02f45a02b6a308b7d9bb70ca77efe (commit)
       via  f8eb72fe5fedbf45e66f433e6bc54e1cf0359760 (commit)
      from  acd292f497cb88d2212be5fe0752dadb05bc9c2a (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=63966e13c4b02f45a02b6a308b7d9bb70ca77efe
commit 63966e13c4b02f45a02b6a308b7d9bb70ca77efe
Merge: acd292f f8eb72f
Author:     Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Nov 2 08:49:12 2015 -0500
Commit:     CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 2 08:49:12 2015 -0500

    Merge topic 'macosx_rpath-clarify-doc' into next
    
    f8eb72fe Help: Clarify documentation for MACOSX_RPATH variable.


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=f8eb72fe5fedbf45e66f433e6bc54e1cf0359760
commit f8eb72fe5fedbf45e66f433e6bc54e1cf0359760
Author:     Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Mon Nov 2 06:46:02 2015 -0700
Commit:     Clinton Stimpson <clin...@elemtech.com>
CommitDate: Mon Nov 2 06:46:02 2015 -0700

    Help: Clarify documentation for MACOSX_RPATH variable.

diff --git a/Help/prop_tgt/MACOSX_RPATH.rst b/Help/prop_tgt/MACOSX_RPATH.rst
index d3934ba..1c503d1 100644
--- a/Help/prop_tgt/MACOSX_RPATH.rst
+++ b/Help/prop_tgt/MACOSX_RPATH.rst
@@ -1,17 +1,22 @@
 MACOSX_RPATH
 ------------
 
-Whether to use rpaths on Mac OS X.
+Whether this target on Mac OS X is located at runtime using rpaths.
 
 When this property is set to true, the directory portion of
-the "install_name" field of shared libraries will be ``@rpath``
-unless overridden by :prop_tgt:`INSTALL_NAME_DIR`.  Runtime
-paths will also be embedded in binaries using this target and
-can be controlled by the :prop_tgt:`INSTALL_RPATH` target property.
+the "install_name" field of this shared library will be ``@rpath``
+unless overridden by :prop_tgt:`INSTALL_NAME_DIR`.  This indicates
+the shared library is to be found at runtime using runtime
+paths (rpaths).
+
 This property is initialized by the value of the variable
 :variable:`CMAKE_MACOSX_RPATH` if it is set when a target is
 created.
 
+Runtime paths will also be embedded in binaries using this target and
+can be controlled by the :prop_tgt:`INSTALL_RPATH` target property on
+the target linking to this target.
+
 Policy CMP0042 was introduced to change the default value of
 MACOSX_RPATH to ON.  This is because use of ``@rpath`` is a
 more flexible and powerful alternative to ``@executable_path`` and

-----------------------------------------------------------------------

Summary of changes:
 Help/prop_tgt/MACOSX_RPATH.rst |   15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits

Reply via email to