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 1c8323b3d143650ee9d0077e1ed2831db1e95d3b (commit) via c53b5cd2215a25e0661cbaf88b22664d1ec09412 (commit) from 853a0e370cde10035906d6f68aacf1e13fdd2bb1 (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=1c8323b3d143650ee9d0077e1ed2831db1e95d3b commit 1c8323b3d143650ee9d0077e1ed2831db1e95d3b Merge: 853a0e3 c53b5cd Author: Brad King <brad.k...@kitware.com> AuthorDate: Thu Feb 27 10:33:37 2014 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Thu Feb 27 10:33:37 2014 -0500 Merge topic 'FindPkgConfig-PKG_CONFIG' into next c53b5cd2 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175) http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=c53b5cd2215a25e0661cbaf88b22664d1ec09412 commit c53b5cd2215a25e0661cbaf88b22664d1ec09412 Author: Christoph GrĂ¼ninger <f...@grueninger.de> AuthorDate: Wed Feb 26 20:48:18 2014 +0100 Commit: Brad King <brad.k...@kitware.com> CommitDate: Thu Feb 27 10:29:01 2014 -0500 FindPkgConfig: Prefer PKG_CONFIG to find pkg-config (#13175) If the environment variable PKG_CONFIG is set, use this as the default pkg-config executable. diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index e6fdefe..7179d17 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -6,6 +6,11 @@ # # # +# To find the pkg-config executable, it uses the variable +# PKG_CONFIG_EXECUTABLE or the environment variable PKG_CONFIG first. +# +# +# # Usage: # # :: @@ -134,8 +139,9 @@ # pkg_search_module (BAR libxml-2.0 libxml2 libxml>=2) #============================================================================= -# Copyright 2006-2009 Kitware, Inc. -# Copyright 2006 Enrico Scholz <enrico.sch...@informatik.tu-chemnitz.de> +# Copyright 2006-2014 Kitware, Inc. +# Copyright 2014 Christoph GrĂ¼ninger <f...@grueninger.de> +# Copyright 2006 Enrico Scholz <enrico.sch...@informatik.tu-chemnitz.de> # # Distributed under the OSI-approved BSD License (the "License"); # see accompanying file Copyright.txt for details. @@ -150,6 +156,10 @@ ### Common stuff #### set(PKG_CONFIG_VERSION 1) +# find pkg-config, use PKG_CONFIG if set +if((NOT PKG_CONFIG_EXECUTABLE) AND (NOT "$ENV{PKG_CONFIG}" STREQUAL "")) + set(PKG_CONFIG_EXECUTABLE "$ENV{PKG_CONFIG}" CACHE FILEPATH "pkg-config executable") +endif() find_program(PKG_CONFIG_EXECUTABLE NAMES pkg-config DOC "pkg-config executable") mark_as_advanced(PKG_CONFIG_EXECUTABLE) ----------------------------------------------------------------------- Summary of changes: Modules/FindPkgConfig.cmake | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/cgi-bin/mailman/listinfo/cmake-commits