[Cmake-commits] [cmake-commits] hoffman committed cmInstallCommandArguments.cxx 1.4 1.4.2.1 cmake.cxx 1.375.2.1 1.375.2.2

[cmake-commits at cmake.org]

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

Modified Files:
      Tag: CMake-2-6
	cmInstallCommandArguments.cxx cmake.cxx 
Log Message:
ENH: merge in from main tree


Index: cmInstallCommandArguments.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommandArguments.cxx,v
retrieving revision 1.4
retrieving revision 1.4.2.1
diff -C 2 -d -r1.4 -r1.4.2.1
*** cmInstallCommandArguments.cxx	4 Feb 2008 22:03:48 -0000	1.4
--- cmInstallCommandArguments.cxx	27 Mar 2008 15:16:30 -0000	1.4.2.1
***************
*** 41,47 ****
  ,NamelinkSkip  (&Parser, "NAMELINK_SKIP" , &ArgumentGroup)
  ,GenericArguments(0)
! {
!   this->Component.SetDefaultString("Unspecified");
! }
  
  const std::string& cmInstallCommandArguments::GetDestination() const
--- 41,45 ----
  ,NamelinkSkip  (&Parser, "NAMELINK_SKIP" , &ArgumentGroup)
  ,GenericArguments(0)
! {}
  
  const std::string& cmInstallCommandArguments::GetDestination() const
***************
*** 68,72 ****
      return this->GenericArguments->GetComponent();
      }
!   return this->EmptyString;
  }
  
--- 66,72 ----
      return this->GenericArguments->GetComponent();
      }
! 
!   static std::string unspecifiedComponent = "Unspecified";
!   return unspecifiedComponent;
  }
  

Index: cmake.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmake.cxx,v
retrieving revision 1.375.2.1
retrieving revision 1.375.2.2
diff -C 2 -d -r1.375.2.1 -r1.375.2.2
*** cmake.cxx	24 Mar 2008 22:23:26 -0000	1.375.2.1
--- cmake.cxx	27 Mar 2008 15:16:30 -0000	1.375.2.2
***************
*** 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