STYLE: fix some typos, nicer debug output

Alex

4 files changed, 7 insertions, 7 deletions

diff --git a/Source/CPack/cpack.cxx b/Source/CPack/cpack.cxx
index 086c869..5ae3afa 100644
--- a/Source/CPack/cpack.cxx
+++ b/Source/CPack/cpack.cxx
@@ -253,7 +253,7 @@ int main (int argc, char *argv[])
       if ( !globalMF->ReadListFile(0, cpackConfigFile.c_str()) )
         {
         cmCPack_Log(&log, cmCPackLog::LOG_ERROR,
-          "Problem reding CPack config file: \""
+          "Problem reading CPack config file: \""
           << cpackConfigFile.c_str() << "\"" << std::endl);
         return 1;
         }
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index 9126c72..ad7e9d6 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -66,7 +66,7 @@ public:
     {
     return
       "  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 "
       "be set to indicate whether the package was found.  Settings that "
       "can be used when <name>_FOUND is true are package-specific.  The "
diff --git a/Source/cmMakefile.cxx b/Source/cmMakefile.cxx
index 2757ad3..0d8ebff 100644
--- a/Source/cmMakefile.cxx
+++ b/Source/cmMakefile.cxx
@@ -306,7 +306,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
       error << "Error in cmake code at\n"
             << lff.FilePath << ":" << lff.Line << ":\n"
             << rm->GetError() << std::endl
-            << "Called from: " << this->GetListFileStack().c_str();
+            << "   Called from: " << this->GetListFileStack().c_str();
       cmSystemTools::Error(error.str().c_str());
       return false;
       }
@@ -323,7 +323,7 @@ bool cmMakefile::ExecuteCommand(const cmListFileFunction& lff)
         error << "Error in cmake code at\n"
               << lff.FilePath << ":" << lff.Line << ":\n"
               << usedCommand->GetError() << std::endl
-              << "Called from: " << this->GetListFileStack().c_str();
+              << "   Called from: " << this->GetListFileStack().c_str();
         cmSystemTools::Error(error.str().c_str());
         result = false;
         if ( this->GetCMakeInstance()->GetScriptMode() )
@@ -2781,7 +2781,7 @@ std::string cmMakefile::GetListFileStack()
       {
       if (depth != this->ListFileStack.size())
         {
-        tmp << "\n             ";
+        tmp << "\n                ";
         }
       --it;
       tmp << "[";
diff --git a/Source/cmakemain.cxx b/Source/cmakemain.cxx
index b7bac99..5413013 100644
--- a/Source/cmakemain.cxx
+++ b/Source/cmakemain.cxx
@@ -208,7 +208,7 @@ static std::string cmakemainGetStack(void *clientdata)
     msg = mf->GetListFileStack();
     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);
   std::string dir;
-  if ((mf) && (strstr(m, "Configuring")==m))
+  if ((mf) && (strstr(m, "Configuring")==m) && (prog<0))
     {
     dir = " ";
     dir += mf->GetCurrentDirectory();