[Cmake-commits] CMake branch, next, updated. v2.8.7-3067-gbc66108

[Alexander Neundorf]

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  bc661082500d1b66e06b621ce2c565f3fa1e8361 (commit)
       via  c91a54db3766aea8f8ab9d5a011db3bba67b12d4 (commit)
      from  666c6d9a63f98daed3a1a3000b0249df1be04731 (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=bc661082500d1b66e06b621ce2c565f3fa1e8361
commit bc661082500d1b66e06b621ce2c565f3fa1e8361
Merge: 666c6d9 c91a54d
Author:     Alexander Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 6 15:18:50 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Tue Mar 6 15:18:50 2012 -0500

    Merge topic 'find_package_fatal_error_if_required_and_config_not_found' into next
    
    c91a54d find_package: error out if REQUIRED Config has not been found


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c91a54db3766aea8f8ab9d5a011db3bba67b12d4
commit c91a54db3766aea8f8ab9d5a011db3bba67b12d4
Author:     Alex Neundorf <neundorf at kde.org>
AuthorDate: Tue Mar 6 21:16:24 2012 +0100
Commit:     Alex Neundorf <neundorf at kde.org>
CommitDate: Tue Mar 6 21:16:24 2012 +0100

    find_package: error out if REQUIRED Config has not been found
    
    If in Config mode a configuration file could not be found, cmake printed
    an error, but did not actually stop processing. With SetFatalErrorOccured
    it does.
    
    Alex

diff --git a/Source/cmFindPackageCommand.cxx b/Source/cmFindPackageCommand.cxx
index 9177162..f8139f9 100644
--- a/Source/cmFindPackageCommand.cxx
+++ b/Source/cmFindPackageCommand.cxx
@@ -1062,6 +1062,10 @@ bool cmFindPackageCommand::HandlePackageMode()
 
     this->Makefile->IssueMessage(
       this->Required? cmake::FATAL_ERROR : cmake::WARNING, e.str());
+    if (this->Required)
+      {
+      cmSystemTools::SetFatalErrorOccured();
+      }
 
     if (!aw.str().empty())
       {

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

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


hooks/post-receive
-- 
CMake