diff options
author | Brad King <brad.king@kitware.com> | 2016-09-06 12:50:58 (GMT) |
---|---|---|
committer | CMake Topic Stage <kwrobot@kitware.com> | 2016-09-06 12:50:58 (GMT) |
commit | cdc911dc53bca22ca56acf2b9a4a0d69e3120c9a (patch) | |
tree | 8a8ba8d854d24745a756fe29fd9a8747eb68b812 /Source/CPack | |
parent | 19255a3516e230da77b18c051d89012bcabcd254 (diff) | |
parent | 4ffdd564eb32be6147cb8610bbf6c0b5496fc56a (diff) | |
download | CMake-cdc911dc53bca22ca56acf2b9a4a0d69e3120c9a.zip CMake-cdc911dc53bca22ca56acf2b9a4a0d69e3120c9a.tar.gz CMake-cdc911dc53bca22ca56acf2b9a4a0d69e3120c9a.tar.bz2 |
Merge topic 'cpack-deb-long-filenames'
4ffdd564 CPack/DEB: Add option to select archive type
Diffstat (limited to 'Source/CPack')
-rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index 1f3ac51..b909598 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -419,6 +419,12 @@ int cmCPackDebGenerator::createDeb() << debian_compression_type << std::endl); } + const char* debian_archive_type = + this->GetOption("GEN_CPACK_DEBIAN_ARCHIVE_TYPE"); + if (!debian_archive_type) { + debian_archive_type = "paxr"; + } + std::string filename_data_tar = strGenWDIR + "/data.tar" + compression_suffix; @@ -431,7 +437,8 @@ int cmCPackDebGenerator::createDeb() << filename_data_tar << "\" for writing" << std::endl); return 0; } - cmArchiveWrite data_tar(fileStream_data_tar, tar_compression_type, "paxr"); + cmArchiveWrite data_tar(fileStream_data_tar, tar_compression_type, + debian_archive_type); // uid/gid should be the one of the root user, and this root user has // always uid/gid equal to 0. @@ -535,7 +542,8 @@ int cmCPackDebGenerator::createDeb() return 0; } cmArchiveWrite control_tar(fileStream_control_tar, - cmArchiveWrite::CompressGZip, "paxr"); + cmArchiveWrite::CompressGZip, + debian_archive_type); // sets permissions and uid/gid for the files control_tar.SetUIDAndGID(0u, 0u); |