kolan/CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andy Cedilnik 2006-10-31 14:28:48 -05:00
parent 605d8871bb
commit 897a2a9029
4 changed files with 1 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Source/cmGlobalGenerator.cxx
View File

@ -1470,8 +1470,7 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
{ {
if(!cmakeCfgIntDir || !*cmakeCfgIntDir || cmakeCfgIntDir[0] == '.') if(!cmakeCfgIntDir || !*cmakeCfgIntDir || cmakeCfgIntDir[0] == '.')
{ {
std::set<cmStdString>* componentsSet std::set<cmStdString>* componentsSet = &this->InstallComponents;
= this->GetCMakeInstance()->GetInstallComponents();
cpackCommandLines.erase(cpackCommandLines.begin(), cpackCommandLines.erase(cpackCommandLines.begin(),
cpackCommandLines.end()); cpackCommandLines.end());
depends.erase(depends.begin(), depends.end()); depends.erase(depends.begin(), depends.end());
@ -1493,7 +1492,6 @@ void cmGlobalGenerator::CreateDefaultGlobalTargets(cmTargets* targets)
ostr << "Only default component available"; ostr << "Only default component available";
} }
singleLine.push_back(ostr.str().c_str()); singleLine.push_back(ostr.str().c_str());
//cpackCommandLines.push_back(singleLine);
(*targets)["list_install_components"] (*targets)["list_install_components"]
= this->CreateGlobalTarget("list_install_components", = this->CreateGlobalTarget("list_install_components",
ostr.str().c_str(), ostr.str().c_str(),

2
Source/cmInstallTargetGenerator.cxx
View File

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

11
Source/cmake.cxx
View File

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

7
Source/cmake.h
View File

@ -285,11 +285,6 @@ class cmake
bool GetDebugOutput() { return this->DebugOutput; } bool GetDebugOutput() { return this->DebugOutput; }
void DebugOutputOn() { this->DebugOutput = true;} void DebugOutputOn() { this->DebugOutput = true;}
//! Add or get installation components
void AddInstallComponent(const char* component);
std::set<cmStdString>* GetInstallComponents()
{ return &this->InstallComponents; }
protected: protected:
typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)(); typedef cmGlobalGenerator* (*CreateGeneratorFunctionType)();
typedef std::map<cmStdString, typedef std::map<cmStdString,
@ -308,8 +303,6 @@ protected:
std::set<cmStdString> WrittenFiles; std::set<cmStdString> WrittenFiles;
std::set<cmStdString> InstallComponents;
///! return true if the same cmake was used to make the cache. ///! return true if the same cmake was used to make the cache.
bool CacheVersionMatches(); bool CacheVersionMatches();
///! read in a cmake list file to initialize the cache ///! read in a cmake list file to initialize the cache