kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge topic 'CPack-DynMONOLITHIC_INSTALL' 

17b05e6 CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too
This commit is contained in:
Brad King 2010-12-16 13:59:40 -05:00 committed by CMake Topic Stage
parent aadee46c60 17b05e6d7f
commit 83b836f61e
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
Source/CPack/cmCPackGenerator.cxx
View File

@ -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_"