From 42ed76bc994ccdad56392ae5ed6213fb307651da Mon Sep 17 00:00:00 2001 From: Calin Cascaval Date: Sat, 20 Dec 2014 21:13:16 -0800 Subject: [PATCH] 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. --- Source/CPack/cmCPackPackageMakerGenerator.cxx | 1 + 1 file changed, 1 insertion(+) diff --git a/Source/CPack/cmCPackPackageMakerGenerator.cxx b/Source/CPack/cmCPackPackageMakerGenerator.cxx index d736948a2..e799d0615 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());