diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2010-12-12 11:30:42 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2010-12-12 11:30:42 (GMT) |
| commit | 17b05e6d7f3460734d750756768e26a214c0cac6 (patch) | |
| tree | 83b2a9babebfb76ff18b20e0667e653a1b7e540d /Source/CPack/cmCPackGenerator.cxx | |
| parent | 1b98d99c28949347c7c6a1e5ee67ee8e49670277 (diff) | |
| download | CMake-17b05e6d7f3460734d750756768e26a214c0cac6.zip CMake-17b05e6d7f3460734d750756768e26a214c0cac6.tar.gz CMake-17b05e6d7f3460734d750756768e26a214c0cac6.tar.bz2 | |
CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index 92e5b6a..71a2a0f 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -551,7 +551,14 @@ int cmCPackGenerator::InstallProjectViaInstallCMakeProjects( std::vector<std::string> componentsVector; bool componentInstall = false; - if (this->SupportsComponentInstallation()) + /* + * We do a component install iff + * - the CPack generator support component + * - the user did not request Monolithic install + * (this works at CPack time too) + */ + if (this->SupportsComponentInstallation() & + !(this->IsSet("CPACK_MONOLITHIC_INSTALL"))) { // Determine the installation types for this project (if provided). std::string installTypesVar = "CPACK_" |