[Cmake-commits] CMake branch, next, updated. v2.8.7-2929-g3c4da43

[Brad King]

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  3c4da433e3a8d1ed6a8da494294a0a6deb3f4229 (commit)
       via  15d7c386e259fa5eef13026584a815357a5b4628 (commit)
       via  e64c241be682e0d82c0368cb359d74301289707a (commit)
       via  ee2fb19a93da5b4904a1cdadd90ec27eadf97c8b (commit)
      from  2609b7966a43fba87a65278efc9d324cc0748f75 (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 -----------------------------------------------------------------
http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=3c4da433e3a8d1ed6a8da494294a0a6deb3f4229
commit 3c4da433e3a8d1ed6a8da494294a0a6deb3f4229
Merge: 2609b79 15d7c38
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 16:14:55 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 16:14:55 2012 -0500

    Merge topic 'FindPackage_ImprovedErrorMessages' into next
    
    15d7c38 Revert "find_package(): improved error message mentioning CMAKE_PREFIX_PATH"
    e64c241 Revert "find_package(): improved error message, mention version number"
    ee2fb19 Revert "find_package: print the error message if an invalid CONFIGS name is used"


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=15d7c386e259fa5eef13026584a815357a5b4628
commit 15d7c386e259fa5eef13026584a815357a5b4628
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 16:11:54 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 16:14:22 2012 -0500

    Revert "find_package(): improved error message mentioning CMAKE_PREFIX_PATH"
    
    This reverts commit 2a48331e5d1ba855429b8c35e832143f18764e1b.
    It will be superseded by another change.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 4fcb4e7..22bb628 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -916,31 +916,31 @@ bool cmFindPackageCommand::HandlePackageMode()
         {
         e << "module Find" << this->Name << ".cmake or ";
         }
+      e << "a configuration file for package " << this->Name << ".\n";
+      if(!this->NoModule)
+        {
+        e << "Adjust CMAKE_MODULE_PATH to find Find"
+          << this->Name << ".cmake or set ";
+        }
+      else
+        {
+        e << "Set ";
+        }
+      e << this->Variable << " to the directory containing a CMake "
+        << "configuration file for " << this->Name << ".  ";
       if(this->Configs.size() == 1)
         {
-        e << "a configuration file named " << this->Configs[0]
-          << " for package " << this->Name << ".\n";
+        e << "The file will be called " << this->Configs[0];
         }
       else
         {
-        e << "a configuration file for package " << this->Name
-          << " with one of the following names:\n";
+        e << "The file will have one of the following names:\n";
         for(std::vector<std::string>::const_iterator ci=this->Configs.begin();
             ci != this->Configs.end(); ++ci)
           {
           e << "  " << *ci << "\n";
           }
         }
-
-      if(!this->NoModule)
-        {
-        e << "Adjust CMAKE_MODULE_PATH to find Find"
-          << this->Name << ".cmake. ";
-        }
-      e << "To find the configuration file, set CMAKE_PREFIX_PATH to the "
-        << "installation prefix of " << this->Name
-        << ", or set " << this->Variable << " to the directory containing a "
-        << "CMake configuration file for " << this->Name << ".  ";
       }
 
 

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=e64c241be682e0d82c0368cb359d74301289707a
commit e64c241be682e0d82c0368cb359d74301289707a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 16:11:46 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 16:13:48 2012 -0500

    Revert "find_package(): improved error message, mention version number"
    
    This reverts commit d46bce95aa3bba22f921906bf74afacc3b6251c9.
    It will be superseded by another change.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index c3e472b..4fcb4e7 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -911,14 +911,6 @@ bool cmFindPackageCommand::HandlePackageMode()
       }
     else
       {
-      std::string requestedVersionString;
-      if(!this->Version.empty())
-        {
-        requestedVersionString = " (requested version ";
-        requestedVersionString += this->Version;
-        requestedVersionString += ")";
-        }
-
       e << "Could not find ";
       if(!this->NoModule)
         {
@@ -927,12 +919,11 @@ bool cmFindPackageCommand::HandlePackageMode()
       if(this->Configs.size() == 1)
         {
         e << "a configuration file named " << this->Configs[0]
-          << " for package " << this->Name << requestedVersionString << ".\n";
+          << " for package " << this->Name << ".\n";
         }
       else
         {
         e << "a configuration file for package " << this->Name
-          << requestedVersionString
           << " with one of the following names:\n";
         for(std::vector<std::string>::const_iterator ci=this->Configs.begin();
             ci != this->Configs.end(); ++ci)

http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ee2fb19a93da5b4904a1cdadd90ec27eadf97c8b
commit ee2fb19a93da5b4904a1cdadd90ec27eadf97c8b
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 16:11:41 2012 -0500
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 16:11:41 2012 -0500

    Revert "find_package: print the error message if an invalid CONFIGS name is used"
    
    This reverts commit fd866f01d484c14b57eb3c2619a06142d6ac85df.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index a166f89..c3e472b 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -538,7 +538,6 @@ bool cmFindPackageCommand
         e << "given CONFIGS option followed by invalid file name \""
           << args[i] << "\".  The names given must be file names without "
           << "a path and with a \".cmake\" extension.";
-        this->SetError(e.str().c_str());
         return false;
         }
       this->Configs.push_back(args[i]);

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

Summary of changes:
 Source/cmFindPackageCommand.cxx |   38 ++++++++++++++------------------------
 1 files changed, 14 insertions(+), 24 deletions(-)


hooks/post-receive
-- 
CMake