[Cmake-commits] [cmake-commits] king committed cmIfCommand.cxx 1.96 1.97

[cmake-commits at cmake.org]

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

Modified Files:
	cmIfCommand.cxx 
Log Message:
ENH: Improve format of if() command messages

Errors and warnings from the if() command always display the argument
list given to the command followed by an explanation of the problem.
This moves the argument list into a pre-formatted block and follows it
with a paragraph-form explanation.  The result looks cleaner.


Index: cmIfCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmIfCommand.cxx,v
retrieving revision 1.96
retrieving revision 1.97
diff -C 2 -d -r1.96 -r1.97
*** cmIfCommand.cxx	12 Jun 2009 15:10:26 -0000	1.96
--- cmIfCommand.cxx	17 Jun 2009 18:18:08 -0000	1.97
***************
*** 91,95 ****
              if (errorString.size())
                {
!               std::string err = "had incorrect arguments: ";
                unsigned int i;
                for(i =0; i < this->Functions[c].Arguments.size(); ++i)
--- 91,95 ----
              if (errorString.size())
                {
!               std::string err = "given arguments\n  ";
                unsigned int i;
                for(i =0; i < this->Functions[c].Arguments.size(); ++i)
***************
*** 100,106 ****
                  err += " ";
                  }
!               err += "(";
                err += errorString;
-               err += ").";
                mf.IssueMessage(messType, err);
                if (messType == cmake::FATAL_ERROR)
--- 100,105 ----
                  err += " ";
                  }
!               err += "\n";
                err += errorString;
                mf.IssueMessage(messType, err);
                if (messType == cmake::FATAL_ERROR)
***************
*** 182,186 ****
    if (errorString.size())
      {
!     std::string err = "had incorrect arguments: ";
      unsigned int i;
      for(i =0; i < args.size(); ++i)
--- 181,185 ----
    if (errorString.size())
      {
!     std::string err = "given arguments\n  ";
      unsigned int i;
      for(i =0; i < args.size(); ++i)
***************
*** 191,197 ****
        err += " ";
        }
!     err += "(";
      err += errorString;
-     err += ").";
      if (status == cmake::FATAL_ERROR)
        {
--- 190,195 ----
        err += " ";
        }
!     err += "\n";
      err += errorString;
      if (status == cmake::FATAL_ERROR)
        {