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

STYLE: fix some typos, nicer debug output 

Alex
This commit is contained in:
Alexander Neundorf 2007-07-19 11:13:01 -04:00
parent 3d862c44f1
commit 8c77fe55dc
4 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Source/CPack/cpack.cxx
View File

@ -253,7 +253,7 @@ int main (int argc, char *argv[])
if ( !globalMF->ReadListFile(0, cpackConfigFile.c_str()) ) if ( !globalMF->ReadListFile(0, cpackConfigFile.c_str()) )
{ {
cmCPack_Log(&log, cmCPackLog::LOG_ERROR, cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
"Problem reding CPack config file: \"" "Problem reading CPack config file: \""
<< cpackConfigFile.c_str() << "\"" << std::endl); << cpackConfigFile.c_str() << "\"" << std::endl);
return 1; return 1;
} }

2
Source/cmFindPackageCommand.h
View File

@ -66,7 +66,7 @@ public:
{ {
return return
" FIND_PACKAGE(<name> [major.minor] [QUIET] [NO_MODULE]\n" " FIND_PACKAGE(<name> [major.minor] [QUIET] [NO_MODULE]\n"
" [[REQUIRED|COMPONENTS] [componets...]])\n" " [[REQUIRED|COMPONENTS] [components...]])\n"
"Finds and loads settings from an external project. <name>_FOUND will " "Finds and loads settings from an external project. <name>_FOUND will "
"be set to indicate whether the package was found. Settings that " "be set to indicate whether the package was found. Settings that "
"can be used when <name>_FOUND is true are package-specific. The " "can be used when <name>_FOUND is true are package-specific. The "

6
Source/cmMakefile.cxx
View File

@ -306,7 +306,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
error << "Error in cmake code at\n" error << "Error in cmake code at\n"
<< lff.FilePath << ":" << lff.Line << ":\n" << lff.FilePath << ":" << lff.Line << ":\n"
<< rm->GetError() << std::endl << rm->GetError() << std::endl
<< "Called from: " << this->GetListFileStack().c_str(); << " Called from: " << this->GetListFileStack().c_str();
cmSystemTools::Error(error.str().c_str()); cmSystemTools::Error(error.str().c_str());
return false; return false;
} }
@ -323,7 +323,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
error << "Error in cmake code at\n" error << "Error in cmake code at\n"
<< lff.FilePath << ":" << lff.Line << ":\n" << lff.FilePath << ":" << lff.Line << ":\n"
<< usedCommand->GetError() << std::endl << usedCommand->GetError() << std::endl
<< "Called from: " << this->GetListFileStack().c_str(); << " Called from: " << this->GetListFileStack().c_str();
cmSystemTools::Error(error.str().c_str()); cmSystemTools::Error(error.str().c_str());
result = false; result = false;
if ( this->GetCMakeInstance()->GetScriptMode() ) if ( this->GetCMakeInstance()->GetScriptMode() )
@ -2781,7 +2781,7 @@ std::string cmMakefile::GetListFileStack()
{ {
if (depth != this->ListFileStack.size()) if (depth != this->ListFileStack.size())
{ {
tmp << "\n "; tmp << "\n ";
} }
--it; --it;
tmp << "["; tmp << "[";

4
Source/cmakemain.cxx
View File

@ -208,7 +208,7 @@ static std::string cmakemainGetStack(void *clientdata)
msg = mf->GetListFileStack(); msg = mf->GetListFileStack();
if (!msg.empty()) if (!msg.empty())
{ {
msg = "\nCalled from: " + msg; msg = "\n Called from: " + msg;
} }
} }
@ -226,7 +226,7 @@ static void cmakemainProgressCallback(const char *m, float prog,
{ {
cmMakefile* mf = cmakemainGetMakefile(clientdata); cmMakefile* mf = cmakemainGetMakefile(clientdata);
std::string dir; std::string dir;
if ((mf) && (strstr(m, "Configuring")==m)) if ((mf) && (strstr(m, "Configuring")==m) && (prog<0))
{ {
dir = " "; dir = " ";
dir += mf->GetCurrentDirectory(); dir += mf->GetCurrentDirectory();