[Cmake-commits] CMake branch, next, updated. v2.8.7-2931-gd673eac

Brad King brad.king at kitware.com
Mon Feb 27 16:16:11 EST 2012


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  d673eac090229a2bca0daeb6fc7a3b5597bb6bde (commit)
       via  b3f9fe42f949515dfdb2635bc0031c5b1b807dc0 (commit)
      from  3c4da433e3a8d1ed6a8da494294a0a6deb3f4229 (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=d673eac090229a2bca0daeb6fc7a3b5597bb6bde
commit d673eac090229a2bca0daeb6fc7a3b5597bb6bde
Merge: 3c4da43 b3f9fe4
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Feb 27 16:16:10 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Feb 27 16:16:10 2012 -0500

    Merge topic 'find_package-report-CONFIGS-error' into next
    
    b3f9fe4 find_package: print error if an invalid CONFIGS name is used


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=b3f9fe42f949515dfdb2635bc0031c5b1b807dc0
commit b3f9fe42f949515dfdb2635bc0031c5b1b807dc0
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Fri Feb 17 11:43:27 2012 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Feb 27 16:09:34 2012 -0500

    find_package: print error if an invalid CONFIGS name is used
    
    In commit 41c2895b (Added version support to Config mode of find_package
    command, 2008-01-28) the error message was computed but was not
    reported.  Add the SetError call to report it.

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 22bb628..b0a7607 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -538,6 +538,7 @@ 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 |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list