summaryrefslogtreecommitdiffstats
path: root/Source/cmGlobalGenerator.cxx
diff options
context:
space:
mode:
authorDavid Cole <david.cole@kitware.com>2009-09-30 15:41:34 (GMT)
committerDavid Cole <david.cole@kitware.com>2009-09-30 15:41:34 (GMT)
commita9dcc7fd47048a25f79f04a0d0a57a81aede617b (patch)
tree367c4e907bdab9961e981e44a40de016fa7a574c /Source/cmGlobalGenerator.cxx
parent67530409a91156b06b3f8076bbd2e96969319fd4 (diff)
downloadCMake-a9dcc7fd47048a25f79f04a0d0a57a81aede617b.zip
CMake-a9dcc7fd47048a25f79f04a0d0a57a81aede617b.tar.gz
CMake-a9dcc7fd47048a25f79f04a0d0a57a81aede617b.tar.bz2
Fix warnings in CMake source code. Suppress warnings in Lexer and Parser files that are 'too hard' to fix.
Diffstat (limited to 'Source/cmGlobalGenerator.cxx')
-rw-r--r--Source/cmGlobalGenerator.cxx9
1 files changed, 6 insertions, 3 deletions
diff --git a/Source/cmGlobalGenerator.cxx b/Source/cmGlobalGenerator.cxx
index 87bf616..34cbe83 100644
--- a/Source/cmGlobalGenerator.cxx
+++ b/Source/cmGlobalGenerator.cxx
@@ -889,7 +889,8 @@ void cmGlobalGenerator::Generate()
this->LocalGenerators[i]->GenerateInstallRules();
this->LocalGenerators[i]->GenerateTestFiles();
this->CMakeInstance->UpdateProgress("Generating",
- (i+1.0f)/this->LocalGenerators.size());
+ (static_cast<float>(i)+1.0f)/
+ static_cast<float>(this->LocalGenerators.size()));
}
this->SetCurrentLocalGenerator(0);
@@ -996,7 +997,8 @@ void cmGlobalGenerator::CheckLocalGenerators()
}
}
this->CMakeInstance->UpdateProgress
- ("Configuring", 0.9f+0.1f*(i+1.0f)/this->LocalGenerators.size());
+ ("Configuring", 0.9f+0.1f*(static_cast<float>(i)+1.0f)/
+ static_cast<float>(this->LocalGenerators.size()));
}
if(notFoundMap.size())
@@ -1262,7 +1264,8 @@ void cmGlobalGenerator::AddLocalGenerator(cmLocalGenerator *lg)
}
int numGen = atoi(numGenC);
- float prog = 0.9f*this->LocalGenerators.size()/numGen;
+ float prog = 0.9f*static_cast<float>(this->LocalGenerators.size())/
+ static_cast<float>(numGen);
if (prog > 0.9f)
{
prog = 0.9f;