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 fb6d38349b79206a6381293cd34e6ec299cf5f20 (commit) via 702c681d7b9222898fd2862ebdf80aaeb38867d3 (commit) from bb9d46a0c05ba8ee02686eb2bb6b54653154efac (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=fb6d38349b79206a6381293cd34e6ec299cf5f20 commit fb6d38349b79206a6381293cd34e6ec299cf5f20 Merge: bb9d46a 702c681d Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Sun Jun 19 03:34:51 2016 -0400 Commit: CMake Topic Stage <kwro...@kitware.com> CommitDate: Sun Jun 19 03:34:51 2016 -0400 Merge topic 'pkgconfig-targets' into next 702c681d FindPkgConfig: fix case of "and" operator https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=702c681d7b9222898fd2862ebdf80aaeb38867d3 commit 702c681d7b9222898fd2862ebdf80aaeb38867d3 Author: Rolf Eike Beer <e...@sf-mail.de> AuthorDate: Sun Jun 19 09:34:30 2016 +0200 Commit: Rolf Eike Beer <e...@sf-mail.de> CommitDate: Sun Jun 19 09:34:30 2016 +0200 FindPkgConfig: fix case of "and" operator diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake index 9e4c84e..b79e9df 100644 --- a/Modules/FindPkgConfig.cmake +++ b/Modules/FindPkgConfig.cmake @@ -597,7 +597,7 @@ macro(pkg_check_modules _prefix _module0) _pkg_check_modules_internal("${_pkg_is_required}" "${_pkg_is_silent}" ${_no_cmake_path} ${_no_cmake_environment_path} ${_imp_target} "${_prefix}" ${_pkg_modules}) _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - elseif (${_prefix}_FOUND and ${_imp_target}) + elseif (${_prefix}_FOUND AND ${_imp_target}) _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path) endif() endmacro() @@ -648,7 +648,7 @@ macro(pkg_search_module _prefix _module0) endif() _pkgconfig_set(__pkg_config_checked_${_prefix} ${PKG_CONFIG_VERSION}) - elseif (${_prefix}_FOUND and ${_imp_target}) + elseif (${_prefix}_FOUND AND ${_imp_target}) _pkg_create_imp_target("${_prefix}" _no_cmake_path _no_cmake_environment_path) endif() endmacro() ----------------------------------------------------------------------- Summary of changes: Modules/FindPkgConfig.cmake | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) hooks/post-receive -- CMake _______________________________________________ Cmake-commits mailing list Cmake-commits@cmake.org http://public.kitware.com/mailman/listinfo/cmake-commits