diff options
| author | Brad King <brad.king@kitware.com> | 2007-05-19 13:55:18 (GMT) |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2007-05-19 13:55:18 (GMT) |
| commit | 4259c7c1e4d8f0bf2912fc080ae5c6522bea9619 (patch) | |
| tree | d17fb2f363762240e434e816efef6fc7ca251fee | |
| parent | 7cd767ca482ad4229e82d58d02a4a8c01054d5c1 (diff) | |
| download | CMake-4259c7c1e4d8f0bf2912fc080ae5c6522bea9619.zip CMake-4259c7c1e4d8f0bf2912fc080ae5c6522bea9619.tar.gz CMake-4259c7c1e4d8f0bf2912fc080ae5c6522bea9619.tar.bz2 | |
COMP: Fix for borland now that components list check is const.
| -rw-r--r-- | Source/cmFileCommand.cxx | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/Source/cmFileCommand.cxx b/Source/cmFileCommand.cxx index 3c2b8ff..ed3ac2c 100644 --- a/Source/cmFileCommand.cxx +++ b/Source/cmFileCommand.cxx @@ -1591,6 +1591,7 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer, 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 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer, { // 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 @@ bool cmFileCommand::DoInstall( cmFileInstaller& installer, // 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. |