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

cmGlobalGenerator: Base progress on Makefiles, not LocalGenerators.

Browse Source
This commit is contained in:
Stephen Kelly 2015-08-02 12:13:41 +02:00
parent bc1097e3d9
commit f8be9ba9c2
1 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Source/cmGlobalGenerator.cxx
View File

@ -1148,9 +1148,9 @@ void cmGlobalGenerator::Configure()
// update the cache entry for the number of local generators, this is used // update the cache entry for the number of local generators, this is used
// for progress // for progress
char num[100]; char num[100];
sprintf(num,"%d",static_cast<int>(this->LocalGenerators.size())); sprintf(num,"%d",static_cast<int>(this->Makefiles.size()));
this->GetCMakeInstance()->AddCacheEntry this->GetCMakeInstance()->AddCacheEntry
("CMAKE_NUMBER_OF_LOCAL_GENERATORS", num, ("CMAKE_NUMBER_OF_MAKEFILES", num,
"number of local generators", cmState::INTERNAL); "number of local generators", cmState::INTERNAL);
// check for link libraries and include directories containing "NOTFOUND" // check for link libraries and include directories containing "NOTFOUND"
@ -1742,9 +1742,9 @@ int cmGlobalGenerator::TryCompile(const std::string& srcdir,
// take the bulk of the time, so try and guess some progress // take the bulk of the time, so try and guess some progress
// by getting closer and closer to 100 without actually getting there. // by getting closer and closer to 100 without actually getting there.
if (!this->CMakeInstance->GetState()->GetInitializedCacheValue if (!this->CMakeInstance->GetState()->GetInitializedCacheValue
("CMAKE_NUMBER_OF_LOCAL_GENERATORS")) ("CMAKE_NUMBER_OF_MAKEFILES"))
{ {
// If CMAKE_NUMBER_OF_LOCAL_GENERATORS is not set // If CMAKE_NUMBER_OF_MAKEFILES is not set
// we are in the first time progress and we have no // we are in the first time progress and we have no
// idea how long it will be. So, just move 1/10th of the way // idea how long it will be. So, just move 1/10th of the way
// there each time, and don't go over 95% // there each time, and don't go over 95%
@ -1935,22 +1935,16 @@ std::string cmGlobalGenerator::GenerateCMakeBuildCommand(
void cmGlobalGenerator::AddMakefile(cmMakefile *mf) void cmGlobalGenerator::AddMakefile(cmMakefile *mf)
{ {
this->Makefiles.push_back(mf); this->Makefiles.push_back(mf);
}
//----------------------------------------------------------------------------
void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
{
this->LocalGenerators.push_back(lg);
// update progress // update progress
// estimate how many lg there will be // estimate how many lg there will be
const char *numGenC = const char *numGenC =
this->CMakeInstance->GetState()->GetInitializedCacheValue this->CMakeInstance->GetState()->GetInitializedCacheValue
("CMAKE_NUMBER_OF_LOCAL_GENERATORS"); ("CMAKE_NUMBER_OF_MAKEFILES");
if (!numGenC) if (!numGenC)
{ {
// If CMAKE_NUMBER_OF_LOCAL_GENERATORS is not set // If CMAKE_NUMBER_OF_MAKEFILES is not set
// we are in the first time progress and we have no // we are in the first time progress and we have no
// idea how long it will be. So, just move half way // idea how long it will be. So, just move half way
// there each time, and don't go over 95% // there each time, and don't go over 95%
@ -1965,7 +1959,7 @@ void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
} }
int numGen = atoi(numGenC); int numGen = atoi(numGenC);
float prog = 0.9f*static_cast<float>(this->LocalGenerators.size())/ float prog = 0.9f*static_cast<float>(this->Makefiles.size())/
static_cast<float>(numGen); static_cast<float>(numGen);
if (prog > 0.9f) if (prog > 0.9f)
{ {
@ -1974,6 +1968,12 @@ void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
this->CMakeInstance->UpdateProgress("Configuring", prog); this->CMakeInstance->UpdateProgress("Configuring", prog);
} }
//----------------------------------------------------------------------------
void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
{
this->LocalGenerators.push_back(lg);
}
void cmGlobalGenerator::AddInstallComponent(const char* component) void cmGlobalGenerator::AddInstallComponent(const char* component)
{ {
if(component && *component) if(component && *component)