[cmake-commits] alex committed cmFindPackageCommand.h 1.11 1.12 cmMakefile.cxx 1.405 1.406 cmakemain.cxx 1.65 1.66

[cmake-commits at cmake.org]

Update of /cvsroot/CMake/CMake/Source
In directory public:/mounts/ram/cvs-serv22182

Modified Files:
	cmFindPackageCommand.h cmMakefile.cxx cmakemain.cxx 
Log Message:

STYLE: fix some typos, nicer debug output

Alex


Index: cmakemain.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmakemain.cxx,v
retrieving revision 1.65
retrieving revision 1.66
diff -u -d -r1.65 -r1.66
--- cmakemain.cxx	17 Jul 2007 17:10:17 -0000	1.65
+++ cmakemain.cxx	19 Jul 2007 15:13:01 -0000	1.66
@@ -208,7 +208,7 @@
     msg = mf->GetListFileStack();
     if (!msg.empty())
       {
-      msg = "\nCalled from: " + msg;
+      msg = "\n   Called from: " + msg;
       }
     }
 
@@ -226,7 +226,7 @@
 {
   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();

Index: cmFindPackageCommand.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFindPackageCommand.h,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- cmFindPackageCommand.h	26 Oct 2006 15:39:56 -0000	1.11
+++ cmFindPackageCommand.h	19 Jul 2007 15:13:01 -0000	1.12
@@ -66,7 +66,7 @@
     {
     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 "

Index: cmMakefile.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefile.cxx,v
retrieving revision 1.405
retrieving revision 1.406
diff -u -d -r1.405 -r1.406
--- cmMakefile.cxx	17 Jul 2007 13:25:08 -0000	1.405
+++ cmMakefile.cxx	19 Jul 2007 15:13:01 -0000	1.406
@@ -306,7 +306,7 @@
       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 @@
         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 @@
       {
       if (depth != this->ListFileStack.size())
         {
-        tmp << "\n             ";
+        tmp << "\n                ";
         }
       --it;
       tmp << "[";