diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2012-02-01 22:32:50 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-02-01 22:32:50 (GMT) |
| commit | 5d18851b25af4f363d72371a5a6492741436eb37 (patch) | |
| tree | f397f62a0cadaaa625957f46cc2ad22cdbed3b14 /Source/CPack | |
| parent | 3cab24a9740ad1d35e548629f6dda12e166ef49e (diff) | |
| download | CMake-5d18851b25af4f363d72371a5a6492741436eb37.zip CMake-5d18851b25af4f363d72371a5a6492741436eb37.tar.gz CMake-5d18851b25af4f363d72371a5a6492741436eb37.tar.bz2 | |
CPackArchive restore default behavior and provide new variable.
CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY should be set by the user
in order to get the toplevel directory included in the archive
whenever a componentized archive is requested. This solves bug #12129
and keeps fully backward compatible behavior.
Diffstat (limited to 'Source/CPack')
| -rw-r--r-- | Source/CPack/cmCPackArchiveGenerator.cxx | 2 | ||||
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx index 12d1796..0ff9050 100644 --- a/Source/CPack/cmCPackArchiveGenerator.cxx +++ b/Source/CPack/cmCPackArchiveGenerator.cxx @@ -58,7 +58,7 @@ int cmCPackArchiveGenerator::addOneComponentToArchive(cmArchiveWrite& archive, // Change to local toplevel cmSystemTools::ChangeDirectory(localToplevel.c_str()); std::string filePrefix; - if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) + if (this->IsOn("CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY")) { filePrefix = this->GetOption("CPACK_PACKAGE_FILE_NAME"); filePrefix += "/"; diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 01ed4df..f7d8a4d 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -691,7 +691,7 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( // one install directory for each component. tempInstallDirectory += GetComponentInstallDirNameSuffix(installComponent); - if (this->IsOn("CPACK_INCLUDE_TOPLEVEL_DIRECTORY")) + if (this->IsOn("CPACK_COMPONENT_INCLUDE_TOPLEVEL_DIRECTORY")) { tempInstallDirectory += "/"; tempInstallDirectory += this->GetOption("CPACK_PACKAGE_FILE_NAME"); |