diff options
| author | Brad King <brad.king@kitware.com> | 2010-12-16 18:59:40 (GMT) |
|---|---|---|
| committer | CMake Topic Stage <kwrobot@kitware.com> | 2010-12-16 18:59:40 (GMT) |
| commit | 83b836f61e691f48a99124c6b16581ddc316920c (patch) | |
| tree | 1f3d674a5aa358757fbfcf01ab308bd6fd9f0695 /Source | |
| parent | aadee46c60953f7e3d3715bb8847dfa6b8bf64fb (diff) | |
| parent | 17b05e6d7f3460734d750756768e26a214c0cac6 (diff) | |
| download | CMake-83b836f61e691f48a99124c6b16581ddc316920c.zip CMake-83b836f61e691f48a99124c6b16581ddc316920c.tar.gz CMake-83b836f61e691f48a99124c6b16581ddc316920c.tar.bz2 | |
Merge topic 'CPack-DynMONOLITHIC_INSTALL'
17b05e6 CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too
Diffstat (limited to 'Source')
| -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_" |