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 0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01 (commit)
via 26fdd9c30a0a74b8642620478f03d40fee967e56 (commit)
via ede2a6ea6b6ff201ea1b2e2f7943b301a28b1df5 (commit)
from e0bc653bebfe35761662ca2d8052c0a347c011f2 (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=0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01
commit 0a36aaf2c94bd9a3df37f164dff80fd4fc17bf01
Merge: e0bc653 26fdd9c
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Thu Feb 18 09:42:06 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Feb 18 09:42:06 2016 -0500
Merge topic 'fix-CPACK_INSTALL_CMAKE_PROJECTS-subdirectory' into next
26fdd9c3 CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
ede2a6ea CMake Nightly Date Stamp
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=26fdd9c30a0a74b8642620478f03d40fee967e56
commit 26fdd9c30a0a74b8642620478f03d40fee967e56
Author: Daniel Wirtz <daniel.wirtz.s...@gmail.com>
AuthorDate: Thu Feb 18 11:30:05 2016 +1300
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Thu Feb 18 09:37:59 2016 -0500
CPack: Fix CPACK_INSTALL_CMAKE_PROJECTS SubDirectory (4th) option
diff --git a/Source/CPack/cmCPackGenerator.cxx
b/Source/CPack/cmCPackGenerator.cxx
index 22d4bf0..3eca280 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -723,10 +723,9 @@ int
cmCPackGenerator::InstallProjectViaInstallCMakeProjects(
cmGlobalGenerator gg(&cm);
cmsys::auto_ptr<cmMakefile> mf(
new cmMakefile(&gg, cm.GetCurrentSnapshot()));
- std::string realInstallDirectory = tempInstallDirectory;
if ( !installSubDirectory.empty() && installSubDirectory != "/" )
{
- realInstallDirectory += installSubDirectory;
+ tempInstallDirectory += installSubDirectory;
}
if (componentInstall)
{
-----------------------------------------------------------------------
Summary of changes:
Source/CMakeVersion.cmake | 2 +-
Source/CPack/cmCPackGenerator.cxx | 3 +--
2 files changed, 2 insertions(+), 3 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
