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 ba8912559febcc1614558d2fb08ec802aa6602f4 (commit) via 8979a1070097fde3ca0ab45bdd6580b7acd07ca4 (commit) from 32e061936368819a8dc60cac90e4997d60a0a9aa (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 ----------------------------------------------------------------- https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=ba8912559febcc1614558d2fb08ec802aa6602f4 commit ba8912559febcc1614558d2fb08ec802aa6602f4 Merge: 32e0619 8979a10 Author: Brad King <brad.k...@kitware.com> AuthorDate: Fri Jan 15 15:13:50 2016 -0500 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Fri Jan 15 15:13:50 2016 -0500 Merge topic 'FindPkgConfig-fix-restore' into next 8979a107 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=8979a1070097fde3ca0ab45bdd6580b7acd07ca4 commit 8979a1070097fde3ca0ab45bdd6580b7acd07ca4 Author: Rob Gowin <robgo...@gmail.com> AuthorDate: Fri Jan 15 11:52:00 2016 -0600 Commit: Brad King <brad.k...@kitware.com> CommitDate: Fri Jan 15 15:12:34 2016 -0500 FindPkgConfig: Fix restoration of PKG_CONFIG_PATH in environment The original value is saved in `_pkg_config_path_old`. Fix this typo left by commit v3.1.0-rc1~763^2 (FindPkgConfig: Extend PKG_CONFIG_PATH using CMake variables, 2014-03-06). diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index eba6953..f24d2da 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -401,7 +401,7 @@ macro(_pkg_check_modules_internal _is_required _is_silent _no_cmake_path _no_cma if(NOT "${_extra_paths}" STREQUAL "") # Restore the environment variable - set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path}) + set(ENV{PKG_CONFIG_PATH} ${_pkgconfig_path_old}) endif() unset(_extra_paths) ----------------------------------------------------------------------- Summary of changes: Modules/FindPkgConfig.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits