From 3b262389bc69e278cfb823cd26e3eae4a6099397 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ferenc=20G=C3=A9czi?= Date: Wed, 23 Nov 2022 00:00:00 +0000 Subject: [PATCH] [3party] Optionally allow building with packaged expat MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Ferenc Géczi --- CMakeLists.txt | 3 ++- coding/internal/xmlparser.hpp | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 116cc3b4ea..b88a0a4c73 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -297,7 +297,8 @@ set(EXPAT_BUILD_DOCS OFF) set(EXPAT_BUILD_PKGCONFIG OFF) set(EXPAT_ENABLE_INSTALL OFF) set(EXPAT_SHARED_LIBS OFF) -add_subdirectory(3party/expat/expat) +find_package_or_fallback_to_3party("expat" "2.5.0" "3party/expat/expat") + add_subdirectory(3party/agg) add_subdirectory(3party/bsdiff-courgette) diff --git a/coding/internal/xmlparser.hpp b/coding/internal/xmlparser.hpp index a7b5070956..2fdf79c0d8 100644 --- a/coding/internal/xmlparser.hpp +++ b/coding/internal/xmlparser.hpp @@ -13,7 +13,7 @@ #include #define XML_STATIC -#include "3party/expat/expat/lib/expat.h" +#include #if defined(__clang__) #pragma clang diagnostic pop