[cmake-commits] king committed cmFileCommand.cxx 1.80 1.81

[cmake-commits at cmake.org]

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

Modified Files:
	cmFileCommand.cxx 
Log Message:
COMP: Fix for borland now that components list check is const.


Index: cmFileCommand.cxx
===================================================================
RCS file: /cvsroot/CMake/CMake/Source/cmFileCommand.cxx,v
retrieving revision 1.80
retrieving revision 1.81
diff -u -d -r1.80 -r1.81
--- cmFileCommand.cxx	18 May 2007 12:49:06 -0000	1.80
+++ cmFileCommand.cxx	19 May 2007 13:55:18 -0000	1.81
@@ -1591,6 +1591,7 @@
                               const std::vector<std::string>& files,
                               const bool optional)
 {
+  typedef std::set<cmStdString>::const_iterator iter_type;
   // Check for component-specific installation.
   const char* cmake_install_component =
     this->Makefile->GetDefinition("CMAKE_INSTALL_COMPONENT");
@@ -1598,7 +1599,8 @@
     {
     // This install rule applies only if it is associated with the
     // current component.
-    if(components.find(cmake_install_component) == components.end())
+    if(iter_type(components.find(cmake_install_component)) ==
+       components.end())
       {
       return true;
       }
@@ -1615,7 +1617,7 @@
       // rule is configuration-specific.  Skip it.
       return true;
       }
-    else if(configurations.find(cmake_install_configuration) ==
+    else if(iter_type(configurations.find(cmake_install_configuration)) ==
             configurations.end())
       {
       // This rule is specific to a configuration not being installed.