cmFindPackageCommand: use iterators to loop over configurations
This commit is contained in:
parent
d546456765
commit
ebf18df580
|
@ -670,10 +670,10 @@ bool cmFindPackageCommand::HandlePackageMode()
|
||||||
<< " requested version \"" << this->Version << "\".\n"
|
<< " requested version \"" << this->Version << "\".\n"
|
||||||
<< "The following configuration files were considered but not "
|
<< "The following configuration files were considered but not "
|
||||||
"accepted:\n";
|
"accepted:\n";
|
||||||
for (std::vector<ConfigFileInfo>::size_type i = 0;
|
for (std::vector<ConfigFileInfo>::const_iterator i =
|
||||||
i < this->ConsideredConfigs.size(); i++) {
|
this->ConsideredConfigs.begin();
|
||||||
e << " " << this->ConsideredConfigs[i].filename
|
i != this->ConsideredConfigs.end(); ++i) {
|
||||||
<< ", version: " << this->ConsideredConfigs[i].version << "\n";
|
e << " " << i->filename << ", version: " << i->version << "\n";
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
std::string requestedVersionString;
|
std::string requestedVersionString;
|
||||||
|
@ -766,12 +766,13 @@ bool cmFindPackageCommand::HandlePackageMode()
|
||||||
std::string consideredVersions;
|
std::string consideredVersions;
|
||||||
|
|
||||||
const char* sep = "";
|
const char* sep = "";
|
||||||
for (std::vector<ConfigFileInfo>::size_type i = 0;
|
for (std::vector<ConfigFileInfo>::const_iterator i =
|
||||||
i < this->ConsideredConfigs.size(); i++) {
|
this->ConsideredConfigs.begin();
|
||||||
|
i != this->ConsideredConfigs.end(); ++i) {
|
||||||
consideredConfigFiles += sep;
|
consideredConfigFiles += sep;
|
||||||
consideredVersions += sep;
|
consideredVersions += sep;
|
||||||
consideredConfigFiles += this->ConsideredConfigs[i].filename;
|
consideredConfigFiles += i->filename;
|
||||||
consideredVersions += this->ConsideredConfigs[i].version;
|
consideredVersions += i->version;
|
||||||
sep = ";";
|
sep = ";";
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue