diff options
| author | Eric NOULARD <eric.noulard@gmail.com> | 2012-03-18 19:21:35 (GMT) |
|---|---|---|
| committer | Eric NOULARD <eric.noulard@gmail.com> | 2012-03-18 19:21:35 (GMT) |
| commit | 805c1b21d63ccc6b02b1a43f438a3b409dd12056 (patch) | |
| tree | caa8e647392bc4541b1a8f2c884df6c337260a02 /Source/CPack/cmCPackGenerator.cxx | |
| parent | 1bfe81e01e1fb8b4e790082d15ca7cf7d7b7f6ae (diff) | |
| download | CMake-805c1b21d63ccc6b02b1a43f438a3b409dd12056.zip CMake-805c1b21d63ccc6b02b1a43f438a3b409dd12056.tar.gz CMake-805c1b21d63ccc6b02b1a43f438a3b409dd12056.tar.bz2 | |
Handle CPACK_MONOLITHIC_INSTALL in some rare use cases.
For example, when CPACK_<GEN>_COMPONENT_INSTALL and
CPACK_MONOLITHIC_INSTALL are both set. Previously, this
combination of variable settings produced an error without
any explanation. Now, in this case CPACK_MONOLITHIC_INSTALL wins
without trouble.
This is useful for when e.g. CPACK_ARCHIVE_COMPONENT_INSTALL is
globally on and one wants MONOLITHIC install for STGZ (but not
other generators). The same behavior may be obtained by re-setting
CPACK_ARCHIVE_COMPONENT_INSTALL to 0 but in any case the
'both set' case should have been handled without error.
Diffstat (limited to 'Source/CPack/cmCPackGenerator.cxx')
| -rw-r--r-- | Source/CPack/cmCPackGenerator.cxx | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/Source/CPack/cmCPackGenerator.cxx b/Source/CPack/cmCPackGenerator.cxx index f7d8a4d..0f832b3 100644 --- a/Source/CPack/cmCPackGenerator.cxx +++ b/Source/CPack/cmCPackGenerator.cxx @@ -1437,6 +1437,12 @@ bool cmCPackGenerator::SupportsComponentInstallation() const } //---------------------------------------------------------------------- +bool cmCPackGenerator::WantsComponentInstallation() const +{ + return (!IsOn("CPACK_MONOLITHIC_INSTALL") & SupportsComponentInstallation()); +} + +//---------------------------------------------------------------------- cmCPackInstallationType* cmCPackGenerator::GetInstallationType(const char *projectName, const char *name) |