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

ENH: add f stuff to avoid warnings

Browse Source
This commit is contained in:
Bill Hoffman 2007-11-12 22:36:26 -05:00
parent d9d40942a0
commit a2ff3928de
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmGlobalGenerator.cxx
View File

@ -681,7 +681,7 @@ bool cmGlobalGenerator::IsDependedOn(const char* project,
void cmGlobalGenerator::Configure() void cmGlobalGenerator::Configure()
{ {
this->FirstTimeProgress = 0.0; this->FirstTimeProgress = 0.0f;
// Delete any existing cmLocalGenerators // Delete any existing cmLocalGenerators
unsigned int i; unsigned int i;
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
@ -908,7 +908,7 @@ int cmGlobalGenerator::TryCompile(const char *srcdir, const char *bindir,
// 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%
this->FirstTimeProgress += ((1.0 - this->FirstTimeProgress) /30.0); this->FirstTimeProgress += ((1.0f - this->FirstTimeProgress) /30.0f);
if(this->FirstTimeProgress > 0.95f) if(this->FirstTimeProgress > 0.95f)
{ {
this->FirstTimeProgress = 0.95f; this->FirstTimeProgress = 0.95f;
@ -1080,7 +1080,7 @@ void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
// 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%
this->FirstTimeProgress += ((1.0 - this->FirstTimeProgress) /30.0); this->FirstTimeProgress += ((1.0f - this->FirstTimeProgress) /30.0f);
if(this->FirstTimeProgress > 0.95f) if(this->FirstTimeProgress > 0.95f)
{ {
this->FirstTimeProgress = 0.95f; this->FirstTimeProgress = 0.95f;