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 3c3d578d7a05df228f7e22e710e9591bbacb2f04 (commit)
via 225abc555de7499f4847e91de22523766541ce61 (commit)
from 6a29e78d1b3471397b307c8044fab752d6b60ebb (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c3d578d7a05df228f7e22e710e9591bbacb2f04
commit 3c3d578d7a05df228f7e22e710e9591bbacb2f04
Merge: 6a29e78 225abc5
Author: Eric Noulard <eric.noul...@gmail.com>
AuthorDate: Wed Sep 22 16:45:20 2010 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Sep 22 16:45:20 2010 -0400
Merge topic 'fixAbsoluteDestHandlingRegression' into next
225abc5 InstallGen/CPack fix handling absolute installed file regression
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=225abc555de7499f4847e91de22523766541ce61
commit 225abc555de7499f4847e91de22523766541ce61
Author: Eric NOULARD <eric.noul...@gmail.com>
AuthorDate: Mon Sep 20 19:12:54 2010 +0200
Commit: Eric NOULARD <eric.noul...@gmail.com>
CommitDate: Mon Sep 20 23:33:35 2010 +0200
InstallGen/CPack fix handling absolute installed file regression
diff --git a/Source/cmInstallGenerator.cxx b/Source/cmInstallGenerator.cxx
index 9d5e416..d7505dc 100644
--- a/Source/cmInstallGenerator.cxx
+++ b/Source/cmInstallGenerator.cxx
@@ -67,8 +67,11 @@ void cmInstallGenerator
for(std::vector<std::string>::const_iterator fi = files.begin();
fi != files.end(); ++fi)
{
- if (fi!=files.begin()) os << ";";
- os << dest << cmSystemTools::ConvertToOutputPath("/");
+ if (fi!=files.begin())
+ {
+ os << ";";
+ }
+ os << dest << "/";
if (rename && *rename)
{
os << rename;
-----------------------------------------------------------------------
Summary of changes:
Source/cmInstallGenerator.cxx | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits
