[Cmake-commits] CMake branch, next, updated. v3.6.0-rc1-296-g91cb438

[Ben Boeckel]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "CMake".

The branch, next has been updated
       via  91cb4389fb3baabbdd0b00d39ce794643b4bb006 (commit)
       via  919db25c3b54f0303a19abb4a9e4f16056a3c1b6 (commit)
       via  ebf18df58083c90d4ba06ab896dfad8df9fe6ade (commit)
      from  ff55f7c75c495605547a97d3bac88ddaaa263a69 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=91cb4389fb3baabbdd0b00d39ce794643b4bb006
commit 91cb4389fb3baabbdd0b00d39ce794643b4bb006
Merge: ff55f7c 919db25
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jun 13 13:15:30 2016 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Jun 13 13:15:30 2016 -0400

    Merge topic 'find_package-duplicate-search-paths' into next
    
    919db25c cmFindPackageCommand: remove duplicate paths from error message
    ebf18df5 cmFindPackageCommand: use iterators to loop over configurations


https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=919db25c3b54f0303a19abb4a9e4f16056a3c1b6
commit 919db25c3b54f0303a19abb4a9e4f16056a3c1b6
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jun 13 11:10:59 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jun 13 11:16:12 2016 -0400

    cmFindPackageCommand: remove duplicate paths from error message
    
    Fixes #15252.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4ab7a72..1945c44 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -664,6 +664,8 @@ bool cmFindPackageCommand::HandlePackageMode()
     // If there are files in ConsideredConfigs, it means that FooConfig.cmake
     // have been found, but they didn't have appropriate versions.
     else if (!this->ConsideredConfigs.empty()) {
+      std::vector<ConfigFileInfo>::const_iterator duplicate_end =
+        cmRemoveDuplicates(this->ConsideredConfigs);
       e << "Could not find a configuration file for package \"" << this->Name
         << "\" that "
         << (this->VersionExact ? "exactly matches" : "is compatible with")
@@ -672,7 +674,7 @@ bool cmFindPackageCommand::HandlePackageMode()
            "accepted:\n";
       for (std::vector<ConfigFileInfo>::const_iterator i =
              this->ConsideredConfigs.begin();
-           i != this->ConsideredConfigs.end(); ++i) {
+           i != duplicate_end; ++i) {
         e << "  " << i->filename << ", version: " << i->version << "\n";
       }
     } else {
diff --git a/Source/cmFindPackageCommand.h b/Source/cmFindPackageCommand.h
index eff6b80..00db22b 100644
--- a/Source/cmFindPackageCommand.h
+++ b/Source/cmFindPackageCommand.h
@@ -159,6 +159,21 @@ private:
   {
     std::string filename;
     std::string version;
+
+    bool operator<(ConfigFileInfo const& rhs) const
+    {
+      return this->filename < rhs.filename;
+    }
+
+    bool operator==(ConfigFileInfo const& rhs) const
+    {
+      return this->filename == rhs.filename;
+    }
+
+    bool operator!=(ConfigFileInfo const& rhs) const
+    {
+      return !(*this == rhs);
+    }
   };
   std::vector<ConfigFileInfo> ConsideredConfigs;
 };

https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ebf18df58083c90d4ba06ab896dfad8df9fe6ade
commit ebf18df58083c90d4ba06ab896dfad8df9fe6ade
Author:     Ben Boeckel <ben.boeckel at kitware.com>
AuthorDate: Mon Jun 13 11:09:05 2016 -0400
Commit:     Ben Boeckel <ben.boeckel at kitware.com>
CommitDate: Mon Jun 13 11:16:10 2016 -0400

    cmFindPackageCommand: use iterators to loop over configurations

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 7908afe..4ab7a72 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -670,10 +670,10 @@ bool cmFindPackageCommand::HandlePackageMode()
         << " requested version \"" << this->Version << "\".\n"
         << "The following configuration files were considered but not "
            "accepted:\n";
-      for (std::vector<ConfigFileInfo>::size_type i = 0;
-           i < this->ConsideredConfigs.size(); i++) {
-        e << "  " << this->ConsideredConfigs[i].filename
-          << ", version: " << this->ConsideredConfigs[i].version << "\n";
+      for (std::vector<ConfigFileInfo>::const_iterator i =
+             this->ConsideredConfigs.begin();
+           i != this->ConsideredConfigs.end(); ++i) {
+        e << "  " << i->filename << ", version: " << i->version << "\n";
       }
     } else {
       std::string requestedVersionString;
@@ -766,12 +766,13 @@ bool cmFindPackageCommand::HandlePackageMode()
   std::string consideredVersions;
 
   const char* sep = "";
-  for (std::vector<ConfigFileInfo>::size_type i = 0;
-       i < this->ConsideredConfigs.size(); i++) {
+  for (std::vector<ConfigFileInfo>::const_iterator i =
+         this->ConsideredConfigs.begin();
+       i != this->ConsideredConfigs.end(); ++i) {
     consideredConfigFiles += sep;
     consideredVersions += sep;
-    consideredConfigFiles += this->ConsideredConfigs[i].filename;
-    consideredVersions += this->ConsideredConfigs[i].version;
+    consideredConfigFiles += i->filename;
+    consideredVersions += i->version;
     sep = ";";
   }
 

-----------------------------------------------------------------------

Summary of changes:
 Source/cmFindPackageCommand.cxx |   19 +++++++++++--------
 Source/cmFindPackageCommand.h   |   15 +++++++++++++++
 2 files changed, 26 insertions(+), 8 deletions(-)


hooks/post-receive
-- 
CMake