[Cmake-commits] [cmake-commits] hoffman committed cmake.cxx 1.377 1.378

[cmake-commits at cmake.org]

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

Modified Files:
	cmake.cxx 
Log Message:
ENH: clean up annoying output from rc tool in VS9


Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.377
retrieving revision 1.378
diff -C 2 -d -r1.377 -r1.378
*** cmake.cxx	22 Mar 2008 14:24:06 -0000	1.377
--- cmake.cxx	27 Mar 2008 02:34:27 -0000	1.378
***************
*** 3937,3944 ****
    cmSystemTools::RunSingleCommand(command,
                                    &output,
!                                   &retCode);
!   if(verbose)
      {
!     std::cout << output << "\n";
      }
    // if retCodeOut is requested then always return true
--- 3937,3949 ----
    cmSystemTools::RunSingleCommand(command,
                                    &output,
!                                   &retCode, 0, false);
!   // always print the output of the command, unless
!   // it is the dumb rc command banner, but if the command
!   // returned an error code then print the output anyway as 
!   // the banner may be mixed with some other important information.
!   if(output.find("Resource Compiler Version") == output.npos
!      || retCode !=0)
      {
!     std::cout << output;
      }
    // if retCodeOut is requested then always return true