kolan
/
CMake
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

COMP: Fix for borland now that components list check is const.

This commit is contained in:
Brad King 2007-05-19 09:55:18 -04:00
parent 7cd767ca48
commit 4259c7c1e4
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Source/cmFileCommand.cxx
View File

@ -1591,6 +1591,7 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer,
const std::vector<std::string>& files, const std::vector<std::string>& files,
const bool optional) const bool optional)
{ {
typedef std::set<cmStdString>::const_iterator iter_type;
// Check for component-specific installation. // Check for component-specific installation.
const char* cmake_install_component = const char* cmake_install_component =
this->Makefile->GetDefinition("CMAKE_INSTALL_COMPONENT"); this->Makefile->GetDefinition("CMAKE_INSTALL_COMPONENT");
@ -1598,7 +1599,8 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer,
{ {
// This install rule applies only if it is associated with the // This install rule applies only if it is associated with the
// current component. // current component.
if(components.find(cmake_install_component) == components.end()) if(iter_type(components.find(cmake_install_component)) ==
components.end())
{ {
return true; return true;
} }
@ -1615,7 +1617,7 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer,
// rule is configuration-specific. Skip it. // rule is configuration-specific. Skip it.
return true; return true;
} }
else if(configurations.find(cmake_install_configuration) == else if(iter_type(configurations.find(cmake_install_configuration)) ==
configurations.end()) configurations.end())
{ {
// This rule is specific to a configuration not being installed. // This rule is specific to a configuration not being installed.