From fc695a776b5a4d61c3bfd3253ff9d40c3f30f6b9 Mon Sep 17 00:00:00 2001 From: Christoph Junghans Date: Tue, 30 Aug 2016 15:37:10 -0600 Subject: [PATCH] FindEXPAT: use hints from PkgConfig --- Modules/FindEXPAT.cmake | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/Modules/FindEXPAT.cmake b/Modules/FindEXPAT.cmake index 70fc35b92..ea55a735e 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