[Cmake-commits] [cmake-commits] david.cole committed cmTarget.cxx 1.284 1.285

[cmake-commits at cmake.org]

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

Modified Files:
	cmTarget.cxx 
Log Message:
Fix issue #9054 - ensure a valid install name for frameworks.

When the INSTALL_NAME_DIR property is empty, still use a name
of the form <name>.framework/Versions/<version>/<name> for
installed frameworks.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.284
retrieving revision 1.285
diff -C 2 -d -r1.284 -r1.285
*** cmTarget.cxx	28 Oct 2009 17:35:25 -0000	1.284
--- cmTarget.cxx	14 Dec 2009 22:46:29 -0000	1.285
***************
*** 3477,3488 ****
                                                        bool for_xcode)
  {
!   // Lookup the target property.
!   const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR");
!   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME") &&
!      !this->Makefile->IsOn("CMAKE_SKIP_RPATH") &&
!      install_name_dir && *install_name_dir)
      {
!     std::string dir = install_name_dir;
!     dir += "/";
      if(this->IsFrameworkOnApple() && !for_xcode)
        {
--- 3477,3494 ----
                                                        bool for_xcode)
  {
!   if(this->Makefile->IsOn("CMAKE_PLATFORM_HAS_INSTALLNAME"))
      {
!     std::string dir;
! 
!     if(!this->Makefile->IsOn("CMAKE_SKIP_RPATH"))
!       {
!       const char* install_name_dir = this->GetProperty("INSTALL_NAME_DIR");
!       if(install_name_dir && *install_name_dir)
!         {
!         dir = install_name_dir;
!         dir += "/";
!         }
!       }
! 
      if(this->IsFrameworkOnApple() && !for_xcode)
        {
***************
*** 3492,3495 ****
--- 3498,3502 ----
        dir += "/";
        }
+ 
      return dir;
      }