From 73c93850184c300f3970a4659e40d49575ae8ab2 Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Sun, 14 Nov 2010 12:16:06 +0100
Subject: [PATCH] CPack   support MONOLITHIC INSTALL at CPack time

---
 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 c39aea4..4382090 100644
--- a/Source/CPack/cmCPackGenerator.cxx
+++ b/Source/CPack/cmCPackGenerator.cxx
@@ -548,7 +548,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_" 
-- 
1.7.2.3

From 090f05dbf7c5f54286eec85188adf3a76163a66f Mon Sep 17 00:00:00 2001
From: Eric NOULARD <eric.noulard@gmail.com>
Date: Mon, 15 Nov 2010 20:41:08 +0100
Subject: [PATCH] CPack backward compatibility fix (2.8.3-->2.8.2) for archive generators

Should fix Bug #11452
---
 Source/CPack/cmCPackArchiveGenerator.cxx |   45 +++++++++++++++++++----------
 1 files changed, 29 insertions(+), 16 deletions(-)

diff --git a/Source/CPack/cmCPackArchiveGenerator.cxx b/Source/CPack/cmCPackArchiveGenerator.cxx
index c86434e..4c77d2c 100644
--- a/Source/CPack/cmCPackArchiveGenerator.cxx
+++ b/Source/CPack/cmCPackArchiveGenerator.cxx
@@ -283,21 +283,24 @@ int cmCPackArchiveGenerator::PackageFiles()
               << std::endl);
     ignoreComponentGroup = true;
   }
-  // CASE 1 : COMPONENT ALL-IN-ONE package
-  // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
-  // then the package file is unique and should be open here.
-  if (allComponentInOne || (allGroupInOne && (!this->ComponentGroups.empty())))
-    {
-    return PackageComponentsAllInOne(allComponentInOne);
-    }
-  // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
-  // There will be 1 package for each component group
-  // however one may require to ignore component group and
-  // in this case you'll get 1 package for each component.
-  else if ((!this->ComponentGroups.empty()) || (ignoreComponentGroup))
-    {
-    return PackageComponents(ignoreComponentGroup);
-    }
+  if (SupportsComponentInstallation()) {
+    // CASE 1 : COMPONENT ALL-IN-ONE package
+    // If ALL GROUPS or ALL COMPONENTS in ONE package has been requested
+    // then the package file is unique and should be open here.
+    if (allComponentInOne ||
+        (allGroupInOne && (!this->ComponentGroups.empty())))
+      {
+      return PackageComponentsAllInOne(allComponentInOne);
+      }
+    // CASE 2 : COMPONENT CLASSICAL package(s) (i.e. not all-in-one)
+    // There will be 1 package for each component group
+    // however one may require to ignore component group and
+    // in this case you'll get 1 package for each component.
+    else if ((!this->ComponentGroups.empty()) || (ignoreComponentGroup))
+      {
+      return PackageComponents(ignoreComponentGroup);
+      }
+  }
 
   // CASE 3 : NON COMPONENT package.
   DECLARE_AND_OPEN_ARCHIVE(packageFileNames[0],archive);
@@ -333,5 +336,15 @@ int cmCPackArchiveGenerator::GenerateHeader(std::ostream*)
 }
 
 bool cmCPackArchiveGenerator::SupportsComponentInstallation() const {
-  return true;
+  // The Component installation support should only
+  // be activated if explicitly requested by the user
+  // (for backward compatibility reason)
+  if (IsSet("CPACK_ARCHIVE_COMPONENT_INSTALL"))
+    {
+      return true;
+    }
+  else
+    {
+      return false;
+    }
 }
-- 
1.7.2.3