From 5c3733770af8ccfda7848928e0fcadb4f462cf1e Mon Sep 17 00:00:00 2001 From: janholt <55844471+janholt@users.noreply.github.com> Date: Thu, 24 Sep 2020 21:41:43 +0300 Subject: [apr-util] use find_package(expat) (#13663) Co-authored-by: janholt --- ports/apr-util/CONTROL | 2 +- ports/apr-util/use-vcpkg-expat.patch | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/ports/apr-util/CONTROL b/ports/apr-util/CONTROL index f3e54d013..c419c4332 100644 --- a/ports/apr-util/CONTROL +++ b/ports/apr-util/CONTROL @@ -1,6 +1,6 @@ Source: apr-util Version: 1.6.1 -Port-Version: 2 +Port-Version: 3 Homepage: https://apr.apache.org/ Description: Apache Portable Runtime (APR) project mission is to create and maintain software libraries that provide a predictable and consistent interface to underlying platform-specific implementation Build-Depends: expat, apr, openssl diff --git a/ports/apr-util/use-vcpkg-expat.patch b/ports/apr-util/use-vcpkg-expat.patch index f124fcdd5..8a35f2bc5 100644 --- a/ports/apr-util/use-vcpkg-expat.patch +++ b/ports/apr-util/use-vcpkg-expat.patch @@ -26,9 +26,9 @@ index 9ae90b1..71a50b0 100644 ENDIF() -IF(NOT EXPAT_FOUND) -+find_path(XMLLIB_INCLUDE_DIR expat.h) -+find_library(XMLLIB_LIBRARIES NAMES libexpat libexpatMD) -+ ++find_package(expat) ++set(XMLLIB_INCLUDE_DIR ${EXPAT_INCLUDE_DIRS}) ++set(XMLLIB_LIBRARIES ${EXPAT_LIBRARIES}) +IF(NOT XMLLIB_LIBRARIES) MESSAGE(FATAL_ERROR "Expat is required, and it wasn't found!") ENDIF() -- cgit v1.2.3