[Cmake-commits] [cmake-commits] king committed cmInstallTargetGenerator.cxx 1.69 1.70 cmInstallTargetGenerator.h 1.29 1.30

[cmake-commits at cmake.org]

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

Modified Files:
	cmInstallTargetGenerator.cxx cmInstallTargetGenerator.h 
Log Message:
ENH: Cleanup per-config target install generation

This cleans up cmInstallTargetGenerator's code that computes the build
tree location of a target under each configuration.


Index: cmInstallTargetGenerator.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.h,v
retrieving revision 1.29
retrieving revision 1.30
diff -C 2 -d -r1.29 -r1.30
*** cmInstallTargetGenerator.h	16 Mar 2009 14:39:50 -0000	1.29
--- cmInstallTargetGenerator.h	3 Jul 2009 12:40:28 -0000	1.30
***************
*** 91,95 ****
    bool Optional;
    NamelinkModeType NamelinkMode;
-   std::string FromDir;
  };
  
--- 91,94 ----

Index: cmInstallTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmInstallTargetGenerator.cxx,v
retrieving revision 1.69
retrieving revision 1.70
diff -C 2 -d -r1.69 -r1.70
*** cmInstallTargetGenerator.cxx	27 Apr 2009 17:20:57 -0000	1.69
--- cmInstallTargetGenerator.cxx	3 Jul 2009 12:40:24 -0000	1.70
***************
*** 59,76 ****
      }
  
-   // Compute the build tree directory from which to copy the target.
-   std::string& fromDir = this->FromDir;
-   if(this->Target->NeedRelinkBeforeInstall())
-     {
-     fromDir = this->Target->GetMakefile()->GetStartOutputDirectory();
-     fromDir += cmake::GetCMakeFilesDirectory();
-     fromDir += "/CMakeRelink.dir/";
-     }
-   else
-     {
-     fromDir = this->Target->GetDirectory(0, this->ImportLibrary);
-     fromDir += "/";
-     }
- 
    // Perform the main install script generation.
    this->cmInstallGenerator::GenerateScript(os);
--- 59,62 ----
***************
*** 82,89 ****
                                                         Indent const& indent)
  {
!   // Compute the per-configuration directory containing the files.
!   std::string fromDirConfig = this->FromDir;
!   this->Target->GetMakefile()->GetLocalGenerator()->GetGlobalGenerator()
!     ->AppendDirectoryForConfig("", config, "/", fromDirConfig);
  
    // Compute the full path to the main installed file for this target.
--- 68,84 ----
                                                         Indent const& indent)
  {
!   // Compute the build tree directory from which to copy the target.
!   std::string fromDirConfig;
!   if(this->Target->NeedRelinkBeforeInstall())
!     {
!     fromDirConfig = this->Target->GetMakefile()->GetStartOutputDirectory();
!     fromDirConfig += cmake::GetCMakeFilesDirectory();
!     fromDirConfig += "/CMakeRelink.dir/";
!     }
!   else
!     {
!     fromDirConfig = this->Target->GetDirectory(config, this->ImportLibrary);
!     fromDirConfig += "/";
!     }
  
    // Compute the full path to the main installed file for this target.