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 5c643daa6edc597d8a3ffe0fc569fdc6100fd204 (commit)
via 42ed76bc994ccdad56392ae5ed6213fb307651da (commit)
from 9d07d0f2b1fbdbf0033d476ab348b00ee29c0dd5 (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=5c643daa6edc597d8a3ffe0fc569fdc6100fd204
commit 5c643daa6edc597d8a3ffe0fc569fdc6100fd204
Merge: 9d07d0f 42ed76b
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Dec 22 09:17:53 2014 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Dec 22 09:17:53 2014 -0500
Merge topic 'cpack-PackageMaker-package-size' into next
42ed76bc cpack: Fix installed size computation with PackageMaker generator
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=42ed76bc994ccdad56392ae5ed6213fb307651da
commit 42ed76bc994ccdad56392ae5ed6213fb307651da
Author: Calin Cascaval <casca...@acm.org>
AuthorDate: Sat Dec 20 21:13:16 2014 -0800
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Dec 22 09:17:12 2014 -0500
cpack: Fix installed size computation with PackageMaker generator
Use the CPACK_PACKAGING_INSTALL_PREFIX when looking for files in a
component. Otherwise we report all packages having size 1.
diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx
b/Source/CPack/cmCPackPackageMakerGenerator.cxx
index d736948..e799d06 100644
--- a/Source/CPack/cmCPackPackageMakerGenerator.cxx
+++ b/Source/CPack/cmCPackPackageMakerGenerator.cxx
@@ -964,6 +964,7 @@ cmCPackPackageMakerGenerator::CreateChoice(const
cmCPackComponent& component,
std::string dirName = this->GetOption("CPACK_TEMPORARY_DIRECTORY");
dirName += '/';
dirName += component.Name;
+ dirName += this->GetOption("CPACK_PACKAGING_INSTALL_PREFIX");
unsigned long installedSize
= component.GetInstalledSizeInKbytes(dirName.c_str());
-----------------------------------------------------------------------
Summary of changes:
Source/CPack/cmCPackPackageMakerGenerator.cxx | 1 +
1 file changed, 1 insertion(+)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
