[logging-log4cxx] 02/02: Use find expat

[rm...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

rmiddleton pushed a commit to branch logcxx_510_rm_vs2019
in repository https://gitbox.apache.org/repos/asf/logging-log4cxx.git

commit 3ac7bff2d320334660d5be7bc1513025f231fedb
Author: Robert Middleton <ro...@rm5248.com>
AuthorDate: Thu Sep 3 21:18:31 2020 -0400

    Use find expat
---
 CMakeLists.txt               | 4 ++++
 src/cmake/FindAPR-Util.cmake | 2 --
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d30a71b..f380439 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -23,6 +23,10 @@ find_package(APR REQUIRED)
 # Find Apache Runtime Utilities
 find_package(APR-Util REQUIRED)
 
+# Find expat for XML parsing
+find_package(EXPAT REQUIRED)
+set(XMLLIB_LIBRARIES EXPAT_LIBRARIES)
+
 # Building
 add_subdirectory(src)
 
diff --git a/src/cmake/FindAPR-Util.cmake b/src/cmake/FindAPR-Util.cmake
index 76d4c3b..aecb240 100644
--- a/src/cmake/FindAPR-Util.cmake
+++ b/src/cmake/FindAPR-Util.cmake
@@ -52,8 +52,6 @@ else()
     else()
       find_library(APR_UTIL_LIBRARIES NAMES libaprutil-1)
       find_program(APR_UTIL_DLL libaprutil-1.dll)
-      find_library(XMLLIB_LIBRARIES NAMES libexpatd)
-      find_program(XMLLIB_DLL libexpatd.dll)
     endif()
 endif()