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 d9fa27a6b1a4088095d8f20da8ca0542a857e989 (commit)
via fc695a776b5a4d61c3bfd3253ff9d40c3f30f6b9 (commit)
from c2addd198fc7d6b417fa25e28d2d1f127e1e3288 (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=d9fa27a6b1a4088095d8f20da8ca0542a857e989
commit d9fa27a6b1a4088095d8f20da8ca0542a857e989
Merge: c2addd1 fc695a7
Author: Brad King <brad.k...@kitware.com>
AuthorDate: Wed Aug 31 14:21:09 2016 -0400
Commit: CMake Topic Stage <kwro...@kitware.com>
CommitDate: Wed Aug 31 14:21:09 2016 -0400
Merge topic 'FindEXPAT-use-PkgConfig' into next
fc695a77 FindEXPAT: use hints from PkgConfig
https://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=fc695a776b5a4d61c3bfd3253ff9d40c3f30f6b9
commit fc695a776b5a4d61c3bfd3253ff9d40c3f30f6b9
Author: Christoph Junghans <jungh...@votca.org>
AuthorDate: Tue Aug 30 15:37:10 2016 -0600
Commit: Christoph Junghans <jungh...@votca.org>
CommitDate: Wed Aug 31 11:52:11 2016 -0600
FindEXPAT: use hints from PkgConfig
diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake
index 70fc35b..ea55a73 100644
--- a/Modules/FindEXPAT.cmake
+++ b/Modules/FindEXPAT.cmake
@@ -25,11 +25,15 @@
# (To distribute this file outside of CMake, substitute the full
# License text for the above reference.)
+find_package(PkgConfig QUIET)
+
+pkg_check_modules(PC_EXPAT QUIET expat)
+
# Look for the header file.
-find_path(EXPAT_INCLUDE_DIR NAMES expat.h)
+find_path(EXPAT_INCLUDE_DIR NAMES expat.h HINTS ${PC_EXPAT_INCLUDE_DIRS})
# Look for the library.
-find_library(EXPAT_LIBRARY NAMES expat libexpat)
+find_library(EXPAT_LIBRARY NAMES expat libexpat HINTS ${PC_EXPAT_LIBRARY_DIRS})
if (EXPAT_INCLUDE_DIR AND EXISTS "${EXPAT_INCLUDE_DIR}/expat.h")
file(STRINGS "${EXPAT_INCLUDE_DIR}/expat.h" expat_version_str
-----------------------------------------------------------------------
Summary of changes:
Modules/FindEXPAT.cmake | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
hooks/post-receive
--
CMake
_______________________________________________
Cmake-commits mailing list
Cmake-commits@cmake.org
http://public.kitware.com/mailman/listinfo/cmake-commits
