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 2d49fa73f23f4591bd22370ee34340a575d02183 (commit)
via 34f2dff61d65681cc54366544336d6085fd463b4 (commit)
from c8631b528e702c5dd11fe5a41ee7e9972caa24c9 (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=2d49fa73f23f4591bd22370ee34340a575d02183
commit 2d49fa73f23f4591bd22370ee34340a575d02183
Merge: c8631b5 34f2dff
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Mar 26 09:48:30 2015 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Thu Mar 26 09:48:30 2015 -0400
Merge topic 'cpack-archive-prefix' into next
34f2dff6 cpack: Fix some test failures caused by 36f7cbca9
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=34f2dff61d65681cc54366544336d6085fd463b4
commit 34f2dff61d65681cc54366544336d6085fd463b4
Author: Clinton Stimpson <clin...@elemtech.com>
AuthorDate: Thu Mar 26 07:21:27 2015 -0600
Commit: Clinton Stimpson <clin...@elemtech.com>
CommitDate: Thu Mar 26 07:21:27 2015 -0600
cpack: Fix some test failures caused by 36f7cbca9
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx
b/Source/CPack/cmCPackArchiveGenerator.cxx
index 373170b..b42a35e 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -64,7 +64,7 @@ int
cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive,
filePrefix += "/";
}
const char* installPrefix =
this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
- if(installPrefix && installPrefix[0] == '/')
+ if(installPrefix && installPrefix[0] == '/' && installPrefix[1] != 0)
{
// add to file prefix and remove the leading '/'
filePrefix += installPrefix+1;
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackArchiveGenerator.cxx | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
