[Cmake-commits] [cmake-commits] king committed cmMakefileExecutableTargetGenerator.cxx 1.57 1.58 cmMakefileLibraryTargetGenerator.cxx 1.73 1.74 cmMakefileTargetGenerator.cxx 1.120 1.121

cmake-commits at cmake.org cmake-commits at cmake.org
Fri Jul 3 10:34:14 EDT 2009


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

Modified Files:
	cmMakefileExecutableTargetGenerator.cxx 
	cmMakefileLibraryTargetGenerator.cxx 
	cmMakefileTargetGenerator.cxx 
Log Message:
ENH: Pass config to cmTarget::GetDirectory()

This teaches the makefile generators to always pass the configuration
name to the cmTarget::GetDirectory method.  Later this will allow
per-configuration target output directories, and it cleans up use of the
current API.


Index: cmMakefileLibraryTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileLibraryTargetGenerator.cxx,v
retrieving revision 1.73
retrieving revision 1.74
diff -C 2 -d -r1.73 -r1.74
*** cmMakefileLibraryTargetGenerator.cxx	3 Jul 2009 12:41:06 -0000	1.73
--- cmMakefileLibraryTargetGenerator.cxx	3 Jul 2009 14:34:10 -0000	1.74
***************
*** 40,44 ****
      {
      this->FrameworkVersion = this->Target->GetFrameworkVersion();
!     this->MacContentDirectory = this->Target->GetDirectory();
      this->MacContentDirectory += "/";
      this->MacContentDirectory += this->TargetNameOut;
--- 40,44 ----
      {
      this->FrameworkVersion = this->Target->GetFrameworkVersion();
!     this->MacContentDirectory = this->Target->GetDirectory(this->ConfigName);
      this->MacContentDirectory += "/";
      this->MacContentDirectory += this->TargetNameOut;
***************
*** 246,250 ****
  
    // Compute the location of the top-level foo.framework directory.
!   std::string top = this->Target->GetDirectory();
    top += "/";
    top += this->TargetNameOut;
--- 246,250 ----
  
    // Compute the location of the top-level foo.framework directory.
!   std::string top = this->Target->GetDirectory(this->ConfigName);
    top += "/";
    top += this->TargetNameOut;
***************
*** 407,416 ****
    else
      {
!     outpath = this->Target->GetDirectory();
      cmSystemTools::MakeDirectory(outpath.c_str());
      outpath += "/";
      if(!targetNameImport.empty())
        {
!       outpathImp = this->Target->GetDirectory(0, true);
        cmSystemTools::MakeDirectory(outpathImp.c_str());
        outpathImp += "/";
--- 407,416 ----
    else
      {
!     outpath = this->Target->GetDirectory(this->ConfigName);
      cmSystemTools::MakeDirectory(outpath.c_str());
      outpath += "/";
      if(!targetNameImport.empty())
        {
!       outpathImp = this->Target->GetDirectory(this->ConfigName, true);
        cmSystemTools::MakeDirectory(outpathImp.c_str());
        outpathImp += "/";

Index: cmMakefileExecutableTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileExecutableTargetGenerator.cxx,v
retrieving revision 1.57
retrieving revision 1.58
diff -C 2 -d -r1.57 -r1.58
*** cmMakefileExecutableTargetGenerator.cxx	3 Jul 2009 12:41:04 -0000	1.57
--- cmMakefileExecutableTargetGenerator.cxx	3 Jul 2009 14:34:08 -0000	1.58
***************
*** 37,41 ****
    if(this->Target->IsAppBundleOnApple())
      {
!     this->MacContentDirectory = this->Target->GetDirectory();
      this->MacContentDirectory += "/";
      this->MacContentDirectory += this->TargetNameOut;
--- 37,41 ----
    if(this->Target->IsAppBundleOnApple())
      {
!     this->MacContentDirectory = this->Target->GetDirectory(this->ConfigName);
      this->MacContentDirectory += "/";
      this->MacContentDirectory += this->TargetNameOut;
***************
*** 127,131 ****
  
    // Construct the full path version of the names.
!   std::string outpath = this->Target->GetDirectory();
    outpath += "/";
    if(this->Target->IsAppBundleOnApple())
--- 127,131 ----
  
    // Construct the full path version of the names.
!   std::string outpath = this->Target->GetDirectory(this->ConfigName);
    outpath += "/";
    if(this->Target->IsAppBundleOnApple())
***************
*** 151,155 ****
      if(!targetNameImport.empty())
        {
!       outpathImp = this->Target->GetDirectory(0, true);
        cmSystemTools::MakeDirectory(outpathImp.c_str());
        outpathImp += "/";
--- 151,155 ----
      if(!targetNameImport.empty())
        {
!       outpathImp = this->Target->GetDirectory(this->ConfigName, true);
        cmSystemTools::MakeDirectory(outpathImp.c_str());
        outpathImp += "/";

Index: cmMakefileTargetGenerator.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmMakefileTargetGenerator.cxx,v
retrieving revision 1.120
retrieving revision 1.121
diff -C 2 -d -r1.120 -r1.121
*** cmMakefileTargetGenerator.cxx	3 Jul 2009 12:41:08 -0000	1.120
--- cmMakefileTargetGenerator.cxx	3 Jul 2009 14:34:10 -0000	1.121
***************
*** 609,613 ****
       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
      {
!     targetFullPathPDB = this->Target->GetDirectory();
      targetFullPathPDB += "/";
      targetFullPathPDB += this->Target->GetPDBName(this->ConfigName);
--- 609,613 ----
       this->Target->GetType() == cmTarget::MODULE_LIBRARY)
      {
!     targetFullPathPDB = this->Target->GetDirectory(this->ConfigName);
      targetFullPathPDB += "/";
      targetFullPathPDB += this->Target->GetPDBName(this->ConfigName);



More information about the Cmake-commits mailing list