This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "CMake".
The branch, next has been updated via bc94eccac2f2d5adf4c154d90ebe64bdafc39b83 (commit) via 17b05e6d7f3460734d750756768e26a214c0cac6 (commit) via 1b98d99c28949347c7c6a1e5ee67ee8e49670277 (commit) via da4c2f6214e8c86c7fa2a49095e7672ea377c8c2 (commit) from a818b0f8778ed31bab695708605d42cc2c0cb4a8 (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=bc94eccac2f2d5adf4c154d90ebe64bdafc39b83 commit bc94eccac2f2d5adf4c154d90ebe64bdafc39b83 Merge: a818b0f 17b05e6 Author: Eric Noulard <eric.noul...@gmail.com> AuthorDate: Sun Dec 12 06:37:12 2010 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Dec 12 06:37:12 2010 -0500 Merge topic 'CPack-DynMONOLITHIC_INSTALL' into next 17b05e6 CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too 1b98d99 KWSys Nightly Date Stamp da4c2f6 KWSys Nightly Date Stamp http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=17b05e6d7f3460734d750756768e26a214c0cac6 commit 17b05e6d7f3460734d750756768e26a214c0cac6 Author: Eric NOULARD <eric.noul...@gmail.com> AuthorDate: Sun Dec 12 12:30:42 2010 +0100 Commit: Eric NOULARD <eric.noul...@gmail.com> CommitDate: Sun Dec 12 12:30:42 2010 +0100 CPack Honor CPACK_MONOLITHIC_INSTALL at CPack time too 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_" ----------------------------------------------------------------------- Summary of changes: Source/CPack/cmCPackGenerator.cxx | 9 ++++++++- Source/kwsys/kwsysDateStamp.cmake | 2 +- 2 files changed, 9 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits