diff options
| author | Alexander Smorkalov <alexander.smorkalov@itseez.com> | 2016-05-10 12:53:19 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2016-05-13 14:46:03 (GMT) |
| commit | 3a55a0e72c216cfe6536e7d8e5c72e3f3e5d65b4 (patch) | |
| tree | 5f81972310037f4b737e618678b8d2bee4c330e2 /Source/CPack | |
| parent | c7f388e723b85b48a1d0d462a8f2f7d962314421 (diff) | |
| download | CMake-3a55a0e72c216cfe6536e7d8e5c72e3f3e5d65b4.zip CMake-3a55a0e72c216cfe6536e7d8e5c72e3f3e5d65b4.tar.gz CMake-3a55a0e72c216cfe6536e7d8e5c72e3f3e5d65b4.tar.bz2 | |
CPack/Deb proper component packages file naming
Proper Debian packages file naming for multi-component setup
(breaks compatibility with previous versions)
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackDebGenerator.cxx | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackDebGenerator.cxx b/Source/CPack/cmCPackDebGenerator.cxx index a09a7cb..9c08713 100644 --- a/Source/CPack/cmCPackDebGenerator.cxx +++ b/Source/CPack/cmCPackDebGenerator.cxx @@ -107,6 +107,9 @@ int cmCPackDebGenerator::PackageOnePack(std::string initialTopLevel, retval = 0; } // add the generated package to package file names list + packageFileName = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); + packageFileName += "/"; + packageFileName += this->GetOption("GEN_CPACK_OUTPUT_FILE_NAME"); packageFileNames.push_back(packageFileName); return retval; } @@ -234,6 +237,9 @@ int cmCPackDebGenerator::PackageComponentsAllInOne() retval = 0; } // add the generated package to package file names list + packageFileName = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); + packageFileName += "/"; + packageFileName += this->GetOption("GEN_CPACK_OUTPUT_FILE_NAME"); packageFileNames.push_back(packageFileName); return retval; } @@ -742,11 +748,12 @@ int cmCPackDebGenerator::createDeb() arFiles.push_back(topLevelString + "data.tar" + compression_suffix); std::string outputFileName = this->GetOption("CPACK_TOPLEVEL_DIRECTORY"); outputFileName += "/"; - outputFileName += this->GetOption("CPACK_OUTPUT_FILE_NAME"); + outputFileName += this->GetOption("GEN_CPACK_OUTPUT_FILE_NAME"); int res = ar_append(outputFileName.c_str(), arFiles); if ( res!=0 ) { - std::string tmpFile = this->GetOption("CPACK_TEMPORARY_PACKAGE_FILE_NAME"); + std::string tmpFile = this->GetOption( + "GEN_CPACK_TEMPORARY_PACKAGE_FILE_NAME"); tmpFile += "/Deb.log"; cmGeneratedFileStream ofs(tmpFile.c_str()); ofs << "# Problem creating archive using: " << res << std::endl; |