[Cmake-commits] [cmake-commits] king committed cmTarget.cxx 1.253 1.254

cmake-commits at cmake.org cmake-commits at cmake.org
Tue Jul 7 11:30:45 EDT 2009


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

Modified Files:
	cmTarget.cxx 
Log Message:
BUG: Do not recompute link interfaces

The config-to-interface map in cmTarget should use case-insensitive
configuration names.  The change avoids repeating work if the given
configuration has a different case than one already computed.


Index: cmTarget.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmTarget.cxx,v
retrieving revision 1.253
retrieving revision 1.254
diff -C 2 -d -r1.253 -r1.254
*** cmTarget.cxx	7 Jul 2009 14:57:02 -0000	1.253
--- cmTarget.cxx	7 Jul 2009 15:30:36 -0000	1.254
***************
*** 3697,3702 ****
  
    // Lookup any existing link interface for this configuration.
    cmTargetInternals::LinkInterfaceMapType::iterator
!     i = this->Internal->LinkInterfaceMap.find(config?config:"");
    if(i == this->Internal->LinkInterfaceMap.end())
      {
--- 3697,3703 ----
  
    // Lookup any existing link interface for this configuration.
+   std::string key = cmSystemTools::UpperCase(config? config : "");
    cmTargetInternals::LinkInterfaceMapType::iterator
!     i = this->Internal->LinkInterfaceMap.find(key);
    if(i == this->Internal->LinkInterfaceMap.end())
      {
***************
*** 3706,3711 ****
  
      // Store the information for this configuration.
!     cmTargetInternals::LinkInterfaceMapType::value_type
!       entry(config?config:"", iface);
      i = this->Internal->LinkInterfaceMap.insert(entry).first;
      }
--- 3707,3711 ----
  
      // Store the information for this configuration.
!     cmTargetInternals::LinkInterfaceMapType::value_type entry(key, iface);
      i = this->Internal->LinkInterfaceMap.insert(entry).first;
      }



More information about the Cmake-commits mailing list