[Cmake-commits] [cmake-commits] king committed cmFileCommand.cxx 1.104 1.105 cmSystemTools.cxx 1.369 1.370

[cmake-commits at cmake.org]

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

Modified Files:
	cmFileCommand.cxx cmSystemTools.cxx 
Log Message:
ENH: Improve error message when installation file(CHRPATH) cannot change the RPATH.


Index: cmSystemTools.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmSystemTools.cxx,v
retrieving revision 1.369
retrieving revision 1.370
diff -C 2 -d -r1.369 -r1.370
*** cmSystemTools.cxx	28 Mar 2008 18:29:28 -0000	1.369
--- cmSystemTools.cxx	7 Apr 2008 14:55:52 -0000	1.370
***************
*** 2230,2234 ****
        if(emsg)
          {
!         *emsg = "The current RPATH does not begin with that specified.";
          }
        return false;
--- 2230,2240 ----
        if(emsg)
          {
!         cmOStringStream e;
!         e << "The current RPATH is:\n"
!           << "  " << se->Value << "\n"
!           << "which does not begin with:\n"
!           << "  " << oldRPath << "\n"
!           << "as was expected.";
!         *emsg = e.str();
          }
        return false;

Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.104
retrieving revision 1.105
diff -C 2 -d -r1.104 -r1.105
*** cmFileCommand.cxx	4 Apr 2008 20:02:50 -0000	1.104
--- cmFileCommand.cxx	7 Apr 2008 14:55:51 -0000	1.105
***************
*** 1408,1413 ****
      {
      cmOStringStream e;
!     e << "CHRPATH could not write new RPATH \""
!       << newRPath << "\" to the file \"" << file << "\": "
        << emsg;
      this->SetError(e.str().c_str());
--- 1408,1415 ----
      {
      cmOStringStream e;
!     e << "CHRPATH could not write new RPATH:\n"
!       << "  " << newRPath << "\n"
!       << "to the file:\n"
!       << "  " << file << "\n"
        << emsg;
      this->SetError(e.str().c_str());