[apr-util] use find_package(expat) (#13663)

Co-authored-by: janholt <janholt@gmail.com>
This commit is contained in:
janholt 2020-09-24 21:41:43 +03:00 committed by GitHub
parent 3031f78ddd
commit 5c3733770a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 4 deletions

View File

@ -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

View File

@ -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()