diff options
| author | Brad King <brad.king@kitware.com> | 2014-12-24 11:38:08 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2014-12-24 11:38:08 (GMT) |
| commit | c20d3d319cb97da5793beebe42a80361b2d247c4 (patch) | |
| tree | 870433693663d999104da649d867e7a95a7bebc9 /Source | |
| parent | 279a2bcd654b35591e4728e2c2a66cbe1ae2a767 (diff) | |
| parent | 42ed76bc994ccdad56392ae5ed6213fb307651da (diff) | |
| download | CMake-c20d3d319cb97da5793beebe42a80361b2d247c4.zip CMake-c20d3d319cb97da5793beebe42a80361b2d247c4.tar.gz CMake-c20d3d319cb97da5793beebe42a80361b2d247c4.tar.bz2 | |
Merge topic 'cpack-PackageMaker-package-size'
42ed76bc cpack: Fix installed size computation with PackageMaker generator
Diffstat (limited to 'Source')
| -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()); |