Explorar o código

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

Andy Cedilnik %!s(int64=19) %!d(string=hai) anos
pai
achega
897a2a9029
Modificáronse 4 ficheiros con 1 adicións e 23 borrados
  1. 1 3
      Source/cmGlobalGenerator.cxx
  2. 0 2
      Source/cmInstallTargetGenerator.cxx
  3. 0 11
      Source/cmake.cxx
  4. 0 7
      Source/cmake.h

+ 1 - 3
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(),

+ 0 - 2
Source/cmInstallTargetGenerator.cxx

@@ -33,8 +33,6 @@ cmInstallTargetGenerator
   Component(component), Optional(optional)
 {
   this->Target->SetHaveInstallRule(true);
-  this->Target->GetMakefile()->GetCMakeInstance()->AddInstallComponent(
-    component);
 }
 
 //----------------------------------------------------------------------------

+ 0 - 11
Source/cmake.cxx

@@ -1307,17 +1307,6 @@ int cmake::ExecuteCMakeCommand(std::vector<std::string>& args)
   return 1;
 }
 
-//----------------------------------------------------------------------------
-void cmake::AddInstallComponent(const char* component)
-{
-  if ( !component )
-    {
-    return;
-    }
-  this->InstallComponents.insert(component);
-}
-
-
 //----------------------------------------------------------------------------
 void cmake::GetRegisteredGenerators(std::vector<std::string>& names)
 {

+ 0 - 7
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