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 23e8657e5854ff3fef364ec490a14fb06556f04d (commit)
via cbccebbac970e37a772ee06ab766b6cbc085532f (commit)
from 0235eda8011ac6f8bdafa2a2e2ae8044c47556dc (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=23e8657e5854ff3fef364ec490a14fb06556f04d
commit 23e8657e5854ff3fef364ec490a14fb06556f04d
Merge: 0235eda cbccebb
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Mon Nov 28 16:20:17 2016 -0500
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Mon Nov 28 16:20:17 2016 -0500
Merge topic 'FindPkgConfig-fix-print-errors' into next
cbccebba FindPkgConfig: Fix missing error text when library version is
specified
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=cbccebbac970e37a772ee06ab766b6cbc085532f
commit cbccebbac970e37a772ee06ab766b6cbc085532f
Author: Gautier Pelloux-Prayer <gautier+...@damsy.net>
AuthorDate: Thu Nov 24 11:14:29 2016 +0100
Commit: Brad King <brad.k...@kitware.com>
CommitDate: Mon Nov 28 16:18:07 2016 -0500
FindPkgConfig: Fix missing error text when library version is specified
Calls like `pkg_check_modules(somelibrary>=3.22)` that specify a version
requirement should still display an informative error when the package
is not found. Fix our logic accordingly.
diff --git a/Modules/FindPkgConfig.cmake b/Modules/FindPkgConfig.cmake
index 3f75b19..8b7131b 100644
--- a/Modules/FindPkgConfig.cmake
+++ b/Modules/FindPkgConfig.cmake
@@ -381,8 +381,9 @@ macro(_pkg_check_modules_internal _is_required _is_silent
_no_cmake_path _no_cma
if (_pkg_check_modules_pkg_op)
list(APPEND _pkg_check_modules_exist_query
"${_pkg_check_modules_pkg_ver}")
else()
- list(APPEND _pkg_check_modules_exist_query --exists --print-errors
--short-errors)
+ list(APPEND _pkg_check_modules_exist_query --exists)
endif()
+ list(APPEND _pkg_check_modules_exist_query --print-errors --short-errors)
_pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_VERSION)
_pkgconfig_unset(${_prefix}_${_pkg_check_modules_pkg_name}_PREFIX)
-----------------------------------------------------------------------
Summary of changes:
Modules/FindPkgConfig.cmake | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
