From 3a2c6414eeb246631576ef386074ac99d6f96323 Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 30 Aug 2019 15:55:38 +0200 Subject: [PATCH] CMake: Add option -DXML_MIN_SIZE=(ON|OFF), default OFF --- expat/CMakeLists.txt | 6 ++++++ expat/Changes | 1 + expat/cmake/expat-config.cmake.in | 1 + 3 files changed, 8 insertions(+) diff --git a/expat/CMakeLists.txt b/expat/CMakeLists.txt index ed9e8171..9b6a1861 100644 --- a/expat/CMakeLists.txt +++ b/expat/CMakeLists.txt @@ -64,6 +64,7 @@ option(XML_UNICODE "Use UTF-16 encoded chars (two bytes) instead of UTF-8" OFF) option(XML_UNICODE_WCHAR_T "Use wchar_t to represent UTF-16 instead of unsigned short" OFF) option(XML_ATTR_INFO "Define to allow retrieving the byte offsets for attribute names and values" OFF) option(XML_LARGE_SIZE "Make XML_GetCurrent* functions return <(unsigned) long long> rather than <(unsigned) long>" OFF) +option(XML_MIN_SIZE "Get a smaller (but slower) parser (in particular avoid multiple copies of the tokenizer)" OFF) if(MSVC) set(MSVC_USE_STATIC_CRT OFF CACHE BOOL "Use /MT flag (static CRT) when compiling in MSVC") endif() @@ -99,6 +100,7 @@ endmacro() expat_bool_to_int(XML_ATTR_INFO) expat_bool_to_int(XML_DTD) expat_bool_to_int(XML_LARGE_SIZE) +expat_bool_to_int(XML_MIN_SIZE) expat_bool_to_int(XML_NS) expat_bool_to_int(XML_UNICODE) expat_bool_to_int(XML_UNICODE_WCHAR_T) @@ -107,6 +109,10 @@ if(XML_LARGE_SIZE) add_definitions(-DXML_LARGE_SIZE) endif() +if(XML_MIN_SIZE) + add_definitions(-DXML_MIN_SIZE) +endif() + if(XML_UNICODE_WCHAR_T AND NOT XML_UNICODE) message(SEND_ERROR "Option XML_UNICODE_WCHAR_T=ON may not be used without XML_UNICODE=ON.") set(XML_UNICODE 1) diff --git a/expat/Changes b/expat/Changes index 6ba3004a..fca4efc5 100644 --- a/expat/Changes +++ b/expat/Changes @@ -25,6 +25,7 @@ Release x.x.x xxx xxx xx xxxx Autotools: Fix "make run-xmltest" for out-of-source builds #244 #264 CMake: Add argument -DXML_ATTR_INFO=(ON|OFF), default OFF #326 CMake: Add argument -DXML_LARGE_SIZE=(ON|OFF), default OFF + #326 CMake: Add argument -DXML_MIN_SIZE=(ON|OFF), default OFF #239 #277 CMake: Add arguments -DUSE_GETRANDOM=(ON|OFF|AUTO), default AUTO -DUSE_SYS_GETRANDOM=(ON|OFF|AUTO), default AUTO diff --git a/expat/cmake/expat-config.cmake.in b/expat/cmake/expat-config.cmake.in index 79af6aa3..3b044f04 100644 --- a/expat/cmake/expat-config.cmake.in +++ b/expat/cmake/expat-config.cmake.in @@ -51,6 +51,7 @@ else() endif() _register_component(dtd @XML_DTD@) _register_component(large_size @XML_LARGE_SIZE@) +_register_component(min_size @XML_MIN_SIZE@) _register_component(ns @XML_NS@) _register_component(unicode @XML_UNICODE@) _register_component(unicode_wchar_t @XML_UNICODE_WCHAR_T@)