[Cmake-commits] CMake branch, next, updated. v2.8.7-2165-g877a660

Brad King brad.king at kitware.com
Fri Jan 20 08:43:16 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  877a66060bec7fccb853de8e0cb14aab8bebe4e8 (commit)
       via  55c3435d88618d7ed935736604e7ab989cef4b28 (commit)
      from  ccede27648e85ebfbce77ccda49d7ec63f80bd4b (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=877a66060bec7fccb853de8e0cb14aab8bebe4e8
commit 877a66060bec7fccb853de8e0cb14aab8bebe4e8
Merge: ccede27 55c3435
Author:     Brad King <brad.king at kitware.com>
AuthorDate: Fri Jan 20 08:43:14 2012 -0500
Commit:     CMake Topic Stage <kwrobot at kitware.com>
CommitDate: Fri Jan 20 08:43:14 2012 -0500

    Merge topic 'FindPkgConfig-REQUIRED-issue-12620' into next
    
    55c3435 FindPkgConfig: respect REQUIRED (#12620)


http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=55c3435d88618d7ed935736604e7ab989cef4b28
commit 55c3435d88618d7ed935736604e7ab989cef4b28
Author:     Yury G. Kudryashov <urkud.urkud at gmail.com>
AuthorDate: Thu Jan 19 23:30:20 2012 +0400
Commit:     Brad King <brad.king at kitware.com>
CommitDate: Fri Jan 20 08:33:51 2012 -0500

    FindPkgConfig: respect REQUIRED (#12620)
    
    find_package(PkgConfig REQUIRED) now fails if pkg-config is not found.

diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index c47f583..ce58899 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -85,14 +85,12 @@
 
 ### Common stuff ####
 set(PKG_CONFIG_VERSION 1)
-set(PKG_CONFIG_FOUND   0)
 
 find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable")
 mark_as_advanced(PKG_CONFIG_EXECUTABLE)
 
-if(PKG_CONFIG_EXECUTABLE)
-  set(PKG_CONFIG_FOUND 1)
-endif(PKG_CONFIG_EXECUTABLE)
+include(${CMAKE_CURRENT_LIST_DIR}/FindPackageHandleStandardArgs.cmake)
+find_package_handle_standard_args(PkgConfig DEFAULT_MSG PKG_CONFIG_EXECUTABLE)
 
 
 # Unsets the given variables

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

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


hooks/post-receive
-- 
CMake


More information about the Cmake-commits mailing list