[Cmake-commits] [cmake-commits] king committed cmTarget.cxx 1.254 1.255 cmTarget.h 1.133 1.134

cmake-commits at cmake.org cmake-commits at cmake.org
Wed Jul 8 08:31:33 EDT 2009


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

Modified Files:
	cmTarget.cxx cmTarget.h 
Log Message:
COMP: Pimplize cmTarget ImportInfo and OutputInfo

These member structures are accessed only in the cmTarget implementation
so they do not need to be defined in the header.  This cleanup also aids
Visual Studio 6 in compiling them.


Index: cmTarget.h
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.h,v
retrieving revision 1.133
retrieving revision 1.134
diff -C 2 -d -r1.133 -r1.134
*** cmTarget.h	7 Jul 2009 14:56:51 -0000	1.133
--- cmTarget.h	8 Jul 2009 12:31:30 -0000	1.134
***************
*** 508,532 ****
  
    // Cache target output paths for each configuration.
!   struct OutputInfo
!   {
!     std::string OutDir;
!     std::string ImpDir;
!   };
!   typedef std::map<cmStdString, OutputInfo> OutputInfoMapType;
!   OutputInfoMapType OutputInfoMap;
    OutputInfo const* GetOutputInfo(const char* config);
    void ComputeOutputDir(const char* config, bool implib, std::string& out);
  
    // Cache import information from properties for each configuration.
!   struct ImportInfo
!   {
!     bool NoSOName;
!     std::string Location;
!     std::string SOName;
!     std::string ImportLibrary;
!     cmTarget::LinkInterface LinkInterface;
!   };
!   typedef std::map<cmStdString, ImportInfo> ImportInfoMapType;
!   ImportInfoMapType ImportInfoMap;
    ImportInfo const* GetImportInfo(const char* config);
    void ComputeImportInfo(std::string const& desired_config, ImportInfo& info);
--- 508,517 ----
  
    // Cache target output paths for each configuration.
!   struct OutputInfo;
    OutputInfo const* GetOutputInfo(const char* config);
    void ComputeOutputDir(const char* config, bool implib, std::string& out);
  
    // Cache import information from properties for each configuration.
!   struct ImportInfo;
    ImportInfo const* GetImportInfo(const char* config);
    void ComputeImportInfo(std::string const& desired_config, ImportInfo& info);

Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.254
retrieving revision 1.255
diff -C 2 -d -r1.254 -r1.255
*** cmTarget.cxx	7 Jul 2009 15:30:36 -0000	1.254
--- cmTarget.cxx	8 Jul 2009 12:31:28 -0000	1.255
***************
*** 37,40 ****
--- 37,57 ----
  
  //----------------------------------------------------------------------------
+ struct cmTarget::OutputInfo
+ {
+   std::string OutDir;
+   std::string ImpDir;
+ };
+ 
+ //----------------------------------------------------------------------------
+ struct cmTarget::ImportInfo
+ {
+   bool NoSOName;
+   std::string Location;
+   std::string SOName;
+   std::string ImportLibrary;
+   cmTarget::LinkInterface LinkInterface;
+ };
+ 
+ //----------------------------------------------------------------------------
  class cmTargetInternals
  {
***************
*** 59,62 ****
--- 76,85 ----
    typedef std::map<cmStdString, OptionalLinkInterface> LinkInterfaceMapType;
    LinkInterfaceMapType LinkInterfaceMap;
+ 
+   typedef std::map<cmStdString, cmTarget::OutputInfo> OutputInfoMapType;
+   OutputInfoMapType OutputInfoMap;
+ 
+   typedef std::map<cmStdString, cmTarget::ImportInfo> ImportInfoMapType;
+   ImportInfoMapType ImportInfoMap;
  };
  
***************
*** 1856,1860 ****
    if(this->IsImported() && strncmp(prop, "IMPORTED", 8) == 0)
      {
!     this->ImportInfoMap.clear();
      }
  }
--- 1879,1883 ----
    if(this->IsImported() && strncmp(prop, "IMPORTED", 8) == 0)
      {
!     this->Internal->ImportInfoMap.clear();
      }
  }
***************
*** 1873,1877 ****
    if(this->IsImported() && strncmp(prop, "IMPORTED", 8) == 0)
      {
!     this->ImportInfoMap.clear();
      }
  }
--- 1896,1900 ----
    if(this->IsImported() && strncmp(prop, "IMPORTED", 8) == 0)
      {
!     this->Internal->ImportInfoMap.clear();
      }
  }
***************
*** 1975,1981 ****
      config_upper = cmSystemTools::UpperCase(config);
      }
    OutputInfoMapType::const_iterator i =
!     this->OutputInfoMap.find(config_upper);
!   if(i == this->OutputInfoMap.end())
      {
      OutputInfo info;
--- 1998,2005 ----
      config_upper = cmSystemTools::UpperCase(config);
      }
+   typedef cmTargetInternals::OutputInfoMapType OutputInfoMapType;
    OutputInfoMapType::const_iterator i =
!     this->Internal->OutputInfoMap.find(config_upper);
!   if(i == this->Internal->OutputInfoMap.end())
      {
      OutputInfo info;
***************
*** 1983,1987 ****
      this->ComputeOutputDir(config, true, info.ImpDir);
      OutputInfoMapType::value_type entry(config_upper, info);
!     i = this->OutputInfoMap.insert(entry).first;
      }
    return &i->second;
--- 2007,2011 ----
      this->ComputeOutputDir(config, true, info.ImpDir);
      OutputInfoMapType::value_type entry(config_upper, info);
!     i = this->Internal->OutputInfoMap.insert(entry).first;
      }
    return &i->second;
***************
*** 3417,3428 ****
      config_upper = "NOCONFIG";
      }
    ImportInfoMapType::const_iterator i =
!     this->ImportInfoMap.find(config_upper);
!   if(i == this->ImportInfoMap.end())
      {
      ImportInfo info;
      this->ComputeImportInfo(config_upper, info);
      ImportInfoMapType::value_type entry(config_upper, info);
!     i = this->ImportInfoMap.insert(entry).first;
      }
  
--- 3441,3453 ----
      config_upper = "NOCONFIG";
      }
+   typedef cmTargetInternals::ImportInfoMapType ImportInfoMapType;
    ImportInfoMapType::const_iterator i =
!     this->Internal->ImportInfoMap.find(config_upper);
!   if(i == this->Internal->ImportInfoMap.end())
      {
      ImportInfo info;
      this->ComputeImportInfo(config_upper, info);
      ImportInfoMapType::value_type entry(config_upper, info);
!     i = this->Internal->ImportInfoMap.insert(entry).first;
      }
  



More information about the Cmake-commits mailing list