diff options
| author | Daniel Nelson <torham@connect2.com> | 2012-01-13 21:01:53 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-01-13 21:01:53 (GMT) |
| commit | 3cab24a9740ad1d35e548629f6dda12e166ef49e (patch) | |
| tree | e2259e546162eccef83aa55c375c3b5739413cfc /Source | |
| parent | 50edbf0f224e81cb85a0588d2495676efc3101f2 (diff) | |
| download | CMake-3cab24a9740ad1d35e548629f6dda12e166ef49e.zip CMake-3cab24a9740ad1d35e548629f6dda12e166ef49e.tar.gz CMake-3cab24a9740ad1d35e548629f6dda12e166ef49e.tar.bz2 | |
CPack Add top level directory in component install for Archive Generators
This patch fixes bug #0012129
Signed-off-by: Eric NOULARD <eric.noulard@gmail.com>
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/CPack/cmCPackArchiveGenerator.cxx | 11 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 5 |
2 files changed, 14 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 0ce5b01..12d1796 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -57,13 +57,20 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive, std::string dir = cmSystemTools::GetCurrentWorkingDirectory(); // Change to local toplevel cmSystemTools::ChangeDirectory(localToplevel.c_str()); + std::string filePrefix; + if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) + { + filePrefix = this->GetOption("CPACK_PACKAGE_FILE_NAME"); + filePrefix += "/"; + } std::vector<std::string>::const_iterator fileIt; for (fileIt = component->Files.begin(); fileIt != component->Files.end(); ++fileIt ) { + std::string rp = filePrefix + *fileIt; cmCPackLogger(cmCPackLog::LOG_DEBUG,"Adding file: " - << (*fileIt) << std::endl); - archive.Add(*fileIt); + << rp << std::endl); + archive.Add(rp); if (!archive) { cmCPackLogger(cmCPackLog::LOG_ERROR, "ERROR while packaging files: " diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 083279f..01ed4df 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -691,6 +691,11 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // one install directory for each component. tempInstallDirectory += GetComponentInstallDirNameSuffix(installComponent); + if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) + { + tempInstallDirectory += "/"; + tempInstallDirectory += this->GetOption("CPACK_PACKAGE_FILE_NAME"); + } } if (!setDestDir) |