ENH: Cleanup of install component list. There was already the list in the global generator. Use that one

4 files changed, 1 insertions, 23 deletions

diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 40da2f61..cd54591 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -1470,8 +1470,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
     {
     if(!cmakeCfgIntDir || !*cmakeCfgIntDir || cmakeCfgIntDir[0] == '.')
       {
-      std::set<cmStdString>* componentsSet
-        = this->GetCMakeInstance()->GetInstallComponents();
+      std::set<cmStdString>* componentsSet = &this->InstallComponents;
       cpackCommandLines.erase(cpackCommandLines.begin(), 
         cpackCommandLines.end());
       depends.erase(depends.begin(), depends.end());
@@ -1493,7 +1492,6 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
         ostr << "Only default component available";
         }
       singleLine.push_back(ostr.str().c_str());
-      //cpackCommandLines.push_back(singleLine);
       (*targets)["list_install_components"]
         = this->CreateGlobalTarget("list_install_components",
           ostr.str().c_str(),
diff --git a/Source/cmInstallTargetGenerator.cxx b/Source/cmInstallTargetGenerator.cxx
index 6b73433..61536c8 100644
--- a/Source/cmInstallTargetGenerator.cxx
+++ b/Source/cmInstallTargetGenerator.cxx
@@ -33,8 +33,6 @@ cmInstallTargetGenerator
   Component(component), Optional(optional)
 {
   this->Target->SetHaveInstallRule(true);
-  this->Target->GetMakefile()->GetCMakeInstance()->AddInstallComponent(
-    component);
 }
 
 //----------------------------------------------------------------------------
diff --git a/Source/cmake.cxx b/Source/cmake.cxx
index e5ebac7..af6fdc9 100644
--- a/Source/cmake.cxx
+++ b/Source/cmake.cxx
@@ -1308,17 +1308,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
 }
 
 //----------------------------------------------------------------------------
-void cmake::AddInstallComponent(const char* component)
-{
-  if ( !component )
-    {
-    return;
-    }
-  this->InstallComponents.insert(component);
-}
-
-
-//----------------------------------------------------------------------------
 void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
 {
   for(RegisteredGeneratorsMap::const_iterator i = this->Generators.begin();
diff --git a/Source/cmake.h b/Source/cmake.h
index 0bb467d..1ccb5f1 100644
--- a/Source/cmake.h
+++ b/Source/cmake.h
@@ -285,11 +285,6 @@ class cmake
   bool GetDebugOutput() { return this->DebugOutput; }
   void DebugOutputOn() { this->DebugOutput = true;}
 
-  //! Add or get installation components
-  void AddInstallComponent(const char* component);
-  std::set<cmStdString>* GetInstallComponents()
-  { return &this->InstallComponents; }
-
 protected:
   typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();
   typedef std::map<cmStdString,
@@ -308,8 +303,6 @@ protected:
 
   std::set<cmStdString> WrittenFiles;
 
-  std::set<cmStdString> InstallComponents;
-
   ///! return true if the same cmake was used to make the cache.
   bool CacheVersionMatches();
   ///! read in a cmake list file to initialize the cache