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

COMP: warning fix

This commit is contained in:
Ken Martin 2006-06-27 14:26:35 -04:00
parent bec28bb03b
commit dcbb4e4461
1 changed files with 18 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
Source/cmLocalUnixMakefileGenerator3.cxx
View File

@ -1448,25 +1448,26 @@ void cmLocalUnixMakefileGenerator3
std::string progressDir = this->Makefile->GetHomeOutputDirectory(); std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory(); progressDir += cmake::GetCMakeFilesDirectory();
cmOStringStream progCmd; {
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files cmOStringStream progCmd;
progCmd << this->Convert(progressDir.c_str(), progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # src files
cmLocalGenerator::FULL, progCmd << this->Convert(progressDir.c_str(),
cmLocalGenerator::SHELL); cmLocalGenerator::FULL,
cmGlobalUnixMakefileGenerator3 *gg = cmLocalGenerator::SHELL);
cmGlobalUnixMakefileGenerator3 *gg =
static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator); static_cast<cmGlobalUnixMakefileGenerator3*>(this->GlobalGenerator);
int n = gg->GetNumberOfSourceFiles(); int n = gg->GetNumberOfSourceFiles();
if(n > 100) if(n > 100)
{ {
n = 100; n = 100;
}
if (this->Parent)
{
n = 0;
}
progCmd << " " << n;
commands.push_back(progCmd.str());
} }
if (this->Parent)
{
n = 0;
}
progCmd << " " << n;
commands.push_back(progCmd.str());
std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash(); std::string mf2Dir = cmake::GetCMakeFilesDirectoryPostSlash();
mf2Dir += "Makefile2"; mf2Dir += "Makefile2";
commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(), commands.push_back(this->GetRecursiveMakeCall(mf2Dir.c_str(),
@ -1476,8 +1477,6 @@ void cmLocalUnixMakefileGenerator3
this->Makefile->GetStartOutputDirectory()); this->Makefile->GetStartOutputDirectory());
if (!this->Parent) if (!this->Parent)
{ {
std::string progressDir = this->Makefile->GetHomeOutputDirectory();
progressDir += cmake::GetCMakeFilesDirectory();
cmOStringStream progCmd; cmOStringStream progCmd;
progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0 progCmd << "$(CMAKE_COMMAND) -E cmake_progress_start "; // # 0
progCmd << this->Convert(progressDir.c_str(), progCmd << this->Convert(progressDir.c_str(),