diff options
| author | Calin Cascaval <cascaval@acm.org> | 2014-12-21 05:13:16 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2014-12-22 14:17:12 (GMT) |
| commit | 42ed76bc994ccdad56392ae5ed6213fb307651da (patch) | |
| tree | f3812570e5561b13e9d594806d2a01606a93eaa1 /Source/CPack | |
| parent | 2c76f6f4da4f0fe9e94d70ec3ba9d3976dc43829 (diff) | |
| download | CMake-42ed76bc994ccdad56392ae5ed6213fb307651da.zip CMake-42ed76bc994ccdad56392ae5ed6213fb307651da.tar.gz CMake-42ed76bc994ccdad56392ae5ed6213fb307651da.tar.bz2 | |
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.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackPackageMakerGenerator.cxx | 1 |
1 files changed, 1 insertions, 0 deletions
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()); |