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

ENH: fix compiler warnings and posibly java test

This commit is contained in:
Ken Martin 2006-05-24 10:09:24 -04:00
parent 65613537e3
commit 2cae0ce389
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Source/cmGlobalUnixMakefileGenerator3.cxx
View File

@ -173,8 +173,9 @@ GetNumberOfCompilableSourceFilesForTarget(cmTarget &tgt)
//---------------------------------------------------------------------------- //----------------------------------------------------------------------------
void cmGlobalUnixMakefileGenerator3::Generate() void cmGlobalUnixMakefileGenerator3::Generate()
{ {
// initialize progress // initialize progress, always pretend there is at least 1 file
this->NumberOfSourceFiles = 0; // to avoid division errors etc
this->NumberOfSourceFiles = 1;
unsigned int i; unsigned int i;
for (i = 0; i < this->LocalGenerators.size(); ++i) for (i = 0; i < this->LocalGenerators.size(); ++i)
{ {
@ -709,7 +710,7 @@ cmGlobalUnixMakefileGenerator3
cmLocalGenerator::SHELL); cmLocalGenerator::SHELL);
progCmd << " " << progCmd << " " <<
(100*this->GetTargetTotalNumberOfSourceFiles(t->second))/ (100*this->GetTargetTotalNumberOfSourceFiles(t->second))/
this->GetNumberOfSourceFiles(); this->NumberOfSourceFiles;
commands.push_back(progCmd.str()); commands.push_back(progCmd.str());
commands.push_back(lg->GetRecursiveMakeCall commands.push_back(lg->GetRecursiveMakeCall
("CMakeFiles/Makefile2",t->second.GetName())); ("CMakeFiles/Makefile2",t->second.GetName()));

5
Source/cmGlobalUnixMakefileGenerator3.h
View File

@ -125,7 +125,6 @@ public:
// returns true if a progress rule should be added // returns true if a progress rule should be added
int ShouldAddProgressRule(); int ShouldAddProgressRule();
int GetNumberOfSourceFiles() {return this->NumberOfSourceFiles; }
int GetNumberOfCompilableSourceFilesForTarget(cmTarget &tgt); int GetNumberOfCompilableSourceFilesForTarget(cmTarget &tgt);
int GetTargetTotalNumberOfSourceFiles(cmTarget& target); int GetTargetTotalNumberOfSourceFiles(cmTarget& target);
@ -183,8 +182,8 @@ protected:
typedef std::map<cmStdString, cmStdString> MultipleOutputPairsType; typedef std::map<cmStdString, cmStdString> MultipleOutputPairsType;
MultipleOutputPairsType MultipleOutputPairs; MultipleOutputPairsType MultipleOutputPairs;
size_t NumberOfSourceFiles; int NumberOfSourceFiles;
size_t NumberOfSourceFilesWritten; int NumberOfSourceFilesWritten;
std::map<cmStdString, std::vector<cmTarget *> > TargetDependencies; std::map<cmStdString, std::vector<cmTarget *> > TargetDependencies;
std::map<cmStdString, int > TargetSourceFileCount; std::map<cmStdString, int > TargetSourceFileCount;