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 905d58d9927224f4907d42179842ef90d95c625f (commit)
via 1b63ce865e86596ad7df3cf39df827434c986f22 (commit)
from 14dac313ccf9212200f48878e3e44f2579523ee3 (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=905d58d9927224f4907d42179842ef90d95c625f
commit 905d58d9927224f4907d42179842ef90d95c625f
Merge: 14dac31 1b63ce8
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Fri Jan 13 09:17:26 2017 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Fri Jan 13 09:17:26 2017 -0500
Merge topic 'fast-local-and-strip-install' into next
1b63ce86 Makefiles: Make fast local and strip install truly fast
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=1b63ce865e86596ad7df3cf39df827434c986f22
commit 1b63ce865e86596ad7df3cf39df827434c986f22
Author: Mike Gelfand <mike...@mikedld.com>
AuthorDate: Fri Jan 13 01:12:57 2017 +0300
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Fri Jan 13 09:16:16 2017 -0500
Makefiles: Make fast local and strip install truly fast
When using a Makefiles generator, `install/local/fast` and
`install/strip/fast` targets are not at all fast. They depend on
`install/local` and `install/strip` targets respectively instead of
`preinstall/fast` and don't contain any commands instead of repeating
commands in `install/local` and `install/strip`. The issue was
introduced by simple typos in commits v2.6.0~2825 (Adding install/local
global target for Makefile generators, 2006-08-29) and v2.6.0~1743 (add
install/strip target for makefile generators, 2007-05-18).
diff --git a/Source/cmLocalUnixMakefileGenerator3.cxx
b/Source/cmLocalUnixMakefileGenerator3.cxx
index ba17f81..41a4caf 100644
--- a/Source/cmLocalUnixMakefileGenerator3.cxx
+++ b/Source/cmLocalUnixMakefileGenerator3.cxx
@@ -1592,8 +1592,8 @@ void cmLocalUnixMakefileGenerator3::WriteLocalAllRules(
// Provide a "/fast" version of the target.
depends.clear();
- if ((targetName == "install") || (targetName == "install_local") ||
- (targetName == "install_strip")) {
+ if ((targetName == "install") || (targetName == "install/local") ||
+ (targetName == "install/strip")) {
// Provide a fast install target that does not depend on all
// but has the same command.
depends.push_back("preinstall/fast");
-----------------------------------------------------------------------
Summary of changes:
Source/cmLocalUnixMakefileGenerator3.cxx | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
