74 lines
2.9 KiB
Diff
74 lines
2.9 KiB
Diff
From daa89e42c005cc7f4f7af9eee271ae0723d30300 Mon Sep 17 00:00:00 2001
|
|
From: Sebastian Pipping <sebastian@pipping.org>
|
|
Date: Thu, 26 Oct 2023 00:59:52 +0200
|
|
Subject: [PATCH 01/17] cmake: Introduce option EXPAT_GE to control macro
|
|
XML_GE
|
|
|
|
Reference: https://github.com//libexpat/libexpat/commit/daa89e42c005cc7f4f7af9eee271ae0723d30300
|
|
Conflict: remove expat_config_h_cmake__expected.txt
|
|
change expat_shy_set to option in CMakeLists.txt
|
|
---
|
|
CMakeLists.txt | 9 +++++++++
|
|
expat_config.h.cmake | 3 +++
|
|
2 files changed, 12 insertions(+)
|
|
|
|
diff --git a/CMakeLists.txt b/CMakeLists.txt
|
|
index cd12a99..697d4d7 100644
|
|
--- a/CMakeLists.txt
|
|
+++ b/CMakeLists.txt
|
|
@@ -126,6 +126,8 @@ set(EXPAT_CONTEXT_BYTES 1024 CACHE STRING "Define to specify how much context to
|
|
mark_as_advanced(EXPAT_CONTEXT_BYTES)
|
|
option(EXPAT_DTD "Define to make parameter entity parsing functionality available" ON)
|
|
mark_as_advanced(EXPAT_DTD)
|
|
+option(EXPAT_GE "Define to make general entity parsing functionality available" ON)
|
|
+mark_as_advanced(EXPAT_GE)
|
|
option(EXPAT_NS "Define to make XML Namespaces functionality available" ON)
|
|
mark_as_advanced(EXPAT_NS)
|
|
option(EXPAT_WARNINGS_AS_ERRORS "Treat all compiler warnings as errors" OFF)
|
|
@@ -156,6 +158,11 @@ endif()
|
|
#
|
|
# Environment checks
|
|
#
|
|
+if(EXPAT_DTD AND NOT EXPAT_GE)
|
|
+ message(SEND_ERROR "Option EXPAT_DTD requires that EXPAT_GE is also enabled.")
|
|
+ message(SEND_ERROR "Please either enable option EXPAT_GE (recommended) or disable EXPAT_DTD also.")
|
|
+endif()
|
|
+
|
|
if(EXPAT_WITH_LIBBSD)
|
|
find_library(LIB_BSD NAMES bsd)
|
|
if(NOT LIB_BSD)
|
|
@@ -258,6 +265,7 @@ endif()
|
|
|
|
_expat_copy_bool_int(EXPAT_ATTR_INFO XML_ATTR_INFO)
|
|
_expat_copy_bool_int(EXPAT_DTD XML_DTD)
|
|
+_expat_copy_bool_int(EXPAT_GE XML_GE)
|
|
_expat_copy_bool_int(EXPAT_LARGE_SIZE XML_LARGE_SIZE)
|
|
_expat_copy_bool_int(EXPAT_MIN_SIZE XML_MIN_SIZE)
|
|
_expat_copy_bool_int(EXPAT_NS XML_NS)
|
|
@@ -758,6 +766,7 @@ message(STATUS " // Advanced options, changes not advised")
|
|
message(STATUS " Attributes info .......... ${EXPAT_ATTR_INFO}")
|
|
message(STATUS " Context bytes ............ ${EXPAT_CONTEXT_BYTES}")
|
|
message(STATUS " DTD support .............. ${EXPAT_DTD}")
|
|
+message(STATUS " General entities ......... ${EXPAT_GE}")
|
|
message(STATUS " Large size ............... ${EXPAT_LARGE_SIZE}")
|
|
message(STATUS " Minimum size ............. ${EXPAT_MIN_SIZE}")
|
|
message(STATUS " Namespace support ........ ${EXPAT_NS}")
|
|
diff --git a/expat_config.h.cmake b/expat_config.h.cmake
|
|
index 173fed1..18d979a 100644
|
|
--- a/expat_config.h.cmake
|
|
+++ b/expat_config.h.cmake
|
|
@@ -100,6 +100,9 @@
|
|
/* Define to make parameter entity parsing functionality available. */
|
|
#cmakedefine XML_DTD
|
|
|
|
+/* Define as 1/0 to enable/disable support for general entities. */
|
|
+#define XML_GE @XML_GE@
|
|
+
|
|
/* Define to make XML Namespaces functionality available. */
|
|
#cmakedefine XML_NS
|
|
|
|
--
|
|
2.33.0
|
|
|
|
|