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, master has been updated
via 20fdf9a92b2c46937353a53949636131d3664fc7 (commit)
via dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f (commit)
via ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36 (commit)
from 57db062414d0ae711a6e66c9eef69eabaa8fee6f (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=20fdf9a92b2c46937353a53949636131d3664fc7
commit 20fdf9a92b2c46937353a53949636131d3664fc7
Merge: 57db062414 dd05ef429a
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Tue Nov 5 16:21:16 2019 +0000
Commit: Kitware Robot <kwro...@kitware.com>
CommitDate: Tue Nov 5 11:21:25 2019 -0500
Merge topic 'docs-INSTALL_REMOVE_ENVIRONMENT_PATH'
dd05ef429a Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs
ac8de0dbcf RPATH: Remove stray indent in generated file(RPATH_CHANGE)
command
Acked-by: Kitware Robot <kwro...@kitware.com>
Merge-request: !3985
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f
commit dd05ef429ab9f2d0377efba7a2bca1bb7181dc2f
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Mon Nov 4 17:02:57 2019 +1100
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Mon Nov 4 17:02:57 2019 +1100
Help: Fix inaccuracies in INSTALL_REMOVE_ENVIRONMENT_RPATH docs
The previous docs assumed one had to set INSTALL_RPATH for
this target property to have an effect, but the actual condition is
only that the install rpath is different to the build rpath. Even if
the install rpath is empty, it is possible that CMake will rewrite
the rpath during install because the build rpath could be
non-empty.
diff --git a/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
b/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
index a474fc6712..72dcaa0b1f 100644
--- a/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
+++ b/Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
@@ -1,10 +1,16 @@
INSTALL_REMOVE_ENVIRONMENT_RPATH
--------------------------------
-Removes compiler defined rpaths durimg installation.
+Controls whether toolchain-defined rpaths should be removed during
installation.
-``INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that if set to ``True`` will
-remove compiler defined rpaths from the project if the user also defines rpath
-with :prop_tgt:`INSTALL_RPATH`. This property is initialized by whether the
-value of :variable:`CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH` is set when a
-target is created.
+When a target is being installed, CMake may need to rewrite its rpath
+information. This occurs when the install rpath (as specified by the
+:prop_tgt:`INSTALL_RPATH` target property) has different contents to the rpath
+that the target was built with. Some toolchains insert their own rpath
+contents into the binary as part of the build. By default, CMake will
+preserve those extra inserted contents in the install rpath. For those
+scenarios where such toolchain-inserted entries need to be discarded during
+install, set the ``INSTALL_REMOVE_ENVIRONMENT_RPATH`` target property to true.
+
+This property is initialized by the value of
+:variable:`CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH` when the target is created.
diff --git a/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
b/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
index 19ae5f3c8b..76ca3da022 100644
--- a/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
+++ b/Help/variable/CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst
@@ -1,9 +1,9 @@
CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH
--------------------------------------
-Removes compiler defined rpaths durimg installation.
+Sets the default for whether toolchain-defined rpaths should be removed during
+installation.
-``CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that if set to ``true``
-removes compiler defined rpaths from the project if the user also defines rpath
-with :prop_tgt:`INSTALL_RPATH`. This is used to initialize the target property
-:prop_tgt:`INSTALL_REMOVE_ENVIRONMENT_RPATH` for all targets.
+``CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH`` is a boolean that provides the
+default value for the :prop_tgt:`INSTALL_REMOVE_ENVIRONMENT_RPATH` property
+of all subsequently created targets.
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36
commit ac8de0dbcfdefa431e4a32c4fd469cb5ac83af36
Author: Craig Scott <craig.sc...@crascit.com>
AuthorDate: Mon Nov 4 16:26:42 2019 +1100
Commit: Craig Scott <craig.sc...@crascit.com>
CommitDate: Mon Nov 4 16:26:42 2019 +1100
RPATH: Remove stray indent in generated file(RPATH_CHANGE) command
diff --git a/Source/cmInstallTargetGenerator.cxx
b/Source/cmInstallTargetGenerator.cxx
index 0cd04cc1d9..aa92fa71ae 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -775,7 +775,7 @@ void cmInstallTargetGenerator::AddChrpathPatchRule(
if (this->Target->GetPropertyAsBool("INSTALL_REMOVE_ENVIRONMENT_RPATH")) {
os << "\n" << indent << " INSTALL_REMOVE_ENVIRONMENT_RPATH)\n";
} else {
- os << indent << ")\n";
+ os << ")\n";
}
}
}
-----------------------------------------------------------------------
Summary of changes:
Help/prop_tgt/INSTALL_REMOVE_ENVIRONMENT_RPATH.rst | 18 ++++++++++++------
.../CMAKE_INSTALL_REMOVE_ENVIRONMENT_RPATH.rst | 10 +++++-----
Source/cmInstallTargetGenerator.cxx | 2 +-
3 files changed, 18 insertions(+), 12 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
https://cmake.org/mailman/listinfo/cmake-commits
