[Cmake-commits] CMake branch, next, updated. v3.0.0-rc2-1417-g1c7c606

Brad King brad.king at kitware.com
Mon Mar 24 09:06:52 EDT 2014


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  1c7c606cbef15a66b5971e1f44bbfd1799aa7932 (commit)
       via  63a4c0af31fd067a189aaa44cd4b8d17e9efd5c7 (commit)
       via  8a306d68e02595a8fc119cf7e2fa267a6ea64498 (commit)
       via  6f39a6ff321ca1682af684713c8ff93a21fe32ae (commit)
       via  d514e41118c8404171cbc6a9520407499af6064a (commit)
      from  25de46e80a8eca5394cda81e966ae6bdaf225115 (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=1c7c606cbef15a66b5971e1f44bbfd1799aa7932
commit 1c7c606cbef15a66b5971e1f44bbfd1799aa7932
Merge: 25de46e 63a4c0a
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Mon Mar 24 09:06:51 2014 -0400
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Mon Mar 24 09:06:51 2014 -0400

    Merge topic 'FindPkgConfig-stop-on-missing' into next
    
    63a4c0af FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
    8a306d68 CMake Nightly Date Stamp
    6f39a6ff CMake Nightly Date Stamp
    d514e411 CMake Nightly Date Stamp


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=63a4c0af31fd067a189aaa44cd4b8d17e9efd5c7
commit 63a4c0af31fd067a189aaa44cd4b8d17e9efd5c7
Author:     Christoph Grüninger <foss at grueninger.de>
AuthorDate: Sat Mar 22 08:54:34 2014 +0100
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Mon Mar 24 08:57:31 2014 -0400

    FindPkgConfig: Stop processing when REQUIRED package not found (#14381)
    
    Make the behavior similar to find_package.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 286cc23..8327143 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -337,7 +337,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma
     if(_pkg_check_modules_failed)
       # fail when requested
       if (${_is_required})
-        message(SEND_ERROR "A required package was not found")
+        message(FATAL_ERROR "A required package was not found")
       endif ()
     else()
       # when we are here, we checked whether requested modules

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

Summary of changes:
 Modules/FindPkgConfig.cmake |    2 +-
 Source/CMakeVersion.cmake   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list