[Cmake-commits] [cmake-commits] alex committed cmInstallCommandArguments.cxx 1.4 1.5

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallCommandArguments.cxx 
Log Message:
BUG: fix the default "Unspecified" component when only the generic (i.e. not
RUNTIME, ARCHIVE, LIBRARY, etc.) arguments are given.

If the component of a part of a target is queried, return the specific one,
if a specific one hasn't been set, return the generic one, if that hasn't
been set, return "Unspecified".

Alex


Index: cmInstallCommandArguments.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallCommandArguments.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -C 2 -d -r1.4 -r1.5
*** cmInstallCommandArguments.cxx	4 Feb 2008 22:03:48 -0000	1.4
--- cmInstallCommandArguments.cxx	26 Mar 2008 22:30:34 -0000	1.5
***************
*** 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;
  }