Merge pull request #328 from libexpat/cmake-xml-min-size

Expose XML_MIN_SIZE build option in CMake

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)

expat/Changes

@@ -24,10 +24,11 @@ Release x.x.x xxx xxx xx xxxx
                     --without-sys-getrandom
                   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
-            #326  CMake: Add argument -DXML_LARGE_SIZE=(ON|OFF), default OFF
             #326  CMake: Install expat_config.h to include directory
             #326  CMake: Generate and install configuration files for
                     future find_package(expat [..] CONFIG [..])

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