[Cmake-commits] [cmake-commits] king committed cmInstallTargetGenerator.cxx 1.72 1.73 cmInstallTargetGenerator.h 1.31 1.32

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallTargetGenerator.cxx cmInstallTargetGenerator.h 
Log Message:
Simplify 'strip' and 'ranlib' install tweak code

The cmInstallTargetGenerator methods AddStripRule and AddRanlibRule do
not need the target type argument.  They can simply use the type of the
target for which the generator instance was created.


Index: cmInstallTargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.h,v
retrieving revision 1.31
retrieving revision 1.32
diff -C 2 -d -r1.31 -r1.32
*** cmInstallTargetGenerator.h	28 Sep 2009 15:42:47 -0000	1.31
--- cmInstallTargetGenerator.h	21 Oct 2009 17:09:55 -0000	1.32
***************
*** 75,82 ****
    
    void AddStripRule(std::ostream& os, Indent const& indent,
-                     cmTarget::TargetType type,
                      const std::string& toDestDirPath);
    void AddRanlibRule(std::ostream& os, Indent const& indent,
-                      cmTarget::TargetType type,
                       const std::string& toDestDirPath);
  
--- 75,80 ----

Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.72
retrieving revision 1.73
diff -C 2 -d -r1.72 -r1.73
*** cmInstallTargetGenerator.cxx	28 Sep 2009 15:42:47 -0000	1.72
--- cmInstallTargetGenerator.cxx	21 Oct 2009 17:09:54 -0000	1.73
***************
*** 316,321 ****
      this->AddInstallNamePatchRule(tw, indent.Next(), config, toDestDirPath);
      this->AddChrpathPatchRule(tw, indent.Next(), config, toDestDirPath);
!     this->AddRanlibRule(tw, indent.Next(), type, toDestDirPath);
!     this->AddStripRule(tw, indent.Next(), type, toDestDirPath);
      std::string tws = tw.str();
  
--- 316,321 ----
      this->AddInstallNamePatchRule(tw, indent.Next(), config, toDestDirPath);
      this->AddChrpathPatchRule(tw, indent.Next(), config, toDestDirPath);
!     this->AddRanlibRule(tw, indent.Next(), toDestDirPath);
!     this->AddStripRule(tw, indent.Next(), toDestDirPath);
      std::string tws = tw.str();
  
***************
*** 600,604 ****
  cmInstallTargetGenerator::AddStripRule(std::ostream& os,
                                         Indent const& indent,
-                                        cmTarget::TargetType type,
                                         const std::string& toDestDirPath)
  {
--- 600,603 ----
***************
*** 606,610 ****
    // don't strip static libraries, because it removes the only symbol table
    // they have so you can't link to them anymore
!   if(type == cmTarget::STATIC_LIBRARY)
      {
      return;
--- 605,609 ----
    // don't strip static libraries, because it removes the only symbol table
    // they have so you can't link to them anymore
!   if(this->Target->GetType() == cmTarget::STATIC_LIBRARY)
      {
      return;
***************
*** 634,642 ****
  cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
                                          Indent const& indent,
-                                         cmTarget::TargetType type,
                                          const std::string& toDestDirPath)
  {
    // Static libraries need ranlib on this platform.
!   if(type != cmTarget::STATIC_LIBRARY)
      {
      return;
--- 633,640 ----
  cmInstallTargetGenerator::AddRanlibRule(std::ostream& os,
                                          Indent const& indent,
                                          const std::string& toDestDirPath)
  {
    // Static libraries need ranlib on this platform.
!   if(this->Target->GetType() != cmTarget::STATIC_LIBRARY)
      {
      return;