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 5373eeccbd6911aa862ecddbbd8fa520646447e6 (commit)
via 9103d8ace327d34a6bc5085e0ec91abc6e8053f1 (commit)
from 680f645f5d26b05b687965dd1baac38b0551ac9f (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=5373eeccbd6911aa862ecddbbd8fa520646447e6
commit 5373eeccbd6911aa862ecddbbd8fa520646447e6
Merge: 680f645 9103d8a
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Nov 8 07:56:57 2015 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Sun Nov 8 07:56:57 2015 -0500
Merge topic 'fix-install-rules' into next
9103d8ac Install: Move SetHaveInstallRule to a more-obvious place
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9103d8ace327d34a6bc5085e0ec91abc6e8053f1
commit 9103d8ace327d34a6bc5085e0ec91abc6e8053f1
Author: Stephen Kelly <steve...@gmail.com>
AuthorDate: Sun Nov 8 13:41:33 2015 +0100
Commit: Stephen Kelly <steve...@gmail.com>
CommitDate: Sun Nov 8 13:56:11 2015 +0100
Install: Move SetHaveInstallRule to a more-obvious place
The moved-from location checks for the existence of whether certain
generators are needed for any target in a loop, rather than whether
the current target has an install rule.
This was introduced in commit v3.4.0-rc1~275^2~3 (cmInstallCommand: Move
the SetHaveInstallRule invocation., 2015-07-28). Move the
SetHaveInstallRule call to a more-obvious place where the
cmInstallTargetGenerator is constructed.
diff --git a/Source/cmInstallCommand.cxx b/Source/cmInstallCommand.cxx
index 333c2ff..d3c2e26 100644
--- a/Source/cmInstallCommand.cxx
+++ b/Source/cmInstallCommand.cxx
@@ -27,6 +27,7 @@ static cmInstallTargetGenerator*
CreateInstallTargetGenerator(cmTarget& target,
{
cmInstallGenerator::MessageLevel message =
cmInstallGenerator::SelectMessageLevel(target.GetMakefile());
+ target.SetHaveInstallRule(true);
return new cmInstallTargetGenerator(target.GetName(),
args.GetDestination().c_str(),
impLib, args.GetPermissions().c_str(),
@@ -753,12 +754,6 @@ bool
cmInstallCommand::HandleTargetsMode(std::vector<std::string> const& args)
installsPublicHeader = installsPublicHeader || publicHeaderGenerator != 0;
installsResource = installsResource || resourceGenerator;
- if (installsArchive || installsRuntime || installsFramework
- || installsLibrary || installsBundle)
- {
- target.SetHaveInstallRule(true);
- }
-
this->Makefile->AddInstallGenerator(archiveGenerator);
this->Makefile->AddInstallGenerator(libraryGenerator);
this->Makefile->AddInstallGenerator(runtimeGenerator);
-----------------------------------------------------------------------
Summary of changes:
Source/cmInstallCommand.cxx | 7 +------
1 file changed, 1 insertion(+), 6 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
