[cmake-commits] andy committed cmGlobalGenerator.cxx 1.159 1.160
cmInstallTargetGenerator.cxx 1.23 1.24 cmake.cxx 1.272 1.273
cmake.h 1.72 1.73
cmake-commits at cmake.org
cmake-commits at cmake.org
Tue Oct 31 14:28:51 EST 2006
Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv31596/Source
Modified Files:
cmGlobalGenerator.cxx cmInstallTargetGenerator.cxx cmake.cxx
cmake.h
Log Message:
ENH: Cleanup of install component list. There was already the list in the global generator. Use that one
Index: cmake.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.h,v
retrieving revision 1.72
retrieving revision 1.73
diff -u -d -r1.72 -r1.73
--- cmake.h 30 Oct 2006 20:59:54 -0000 1.72
+++ cmake.h 31 Oct 2006 19:28:48 -0000 1.73
@@ -285,11 +285,6 @@
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 @@
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
Index: cmGlobalGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmGlobalGenerator.cxx,v
retrieving revision 1.159
retrieving revision 1.160
diff -u -d -r1.159 -r1.160
--- cmGlobalGenerator.cxx 30 Oct 2006 20:59:53 -0000 1.159
+++ cmGlobalGenerator.cxx 31 Oct 2006 19:28:48 -0000 1.160
@@ -1470,8 +1470,7 @@
{
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 @@
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(),
Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -d -r1.23 -r1.24
--- cmInstallTargetGenerator.cxx 31 Oct 2006 11:43:18 -0000 1.23
+++ cmInstallTargetGenerator.cxx 31 Oct 2006 19:28:48 -0000 1.24
@@ -33,8 +33,6 @@
Component(component), Optional(optional)
{
this->Target->SetHaveInstallRule(true);
- this->Target->GetMakefile()->GetCMakeInstance()->AddInstallComponent(
- component);
}
//----------------------------------------------------------------------------
Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.272
retrieving revision 1.273
diff -u -d -r1.272 -r1.273
--- cmake.cxx 30 Oct 2006 20:59:54 -0000 1.272
+++ cmake.cxx 31 Oct 2006 19:28:48 -0000 1.273
@@ -1308,17 +1308,6 @@
}
//----------------------------------------------------------------------------
-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();
More information about the Cmake-commits
mailing list