diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2022-10-13 01:55:18 +0200 |
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2022-10-13 12:49:42 +0200 |
| commit | 59495c9090d32de025310bc9e3c9febb93c9f6a9 (patch) | |
| tree | 45cec6a916679fd990d551a77069be9ebf494deb /ConfigureChecks.cmake | |
| parent | 952d83261a350e4a7a6c21694395e959f08b98bf (diff) | |
| download | tdewebdev-59495c90.tar.gz tdewebdev-59495c90.zip | |
Remove code to support libxml2 < 2.6.
Enable LIBXML_DOCB_ENABLED independently of the presence
of 'libxml/DOCBparser.h' because from libxml2 >= 2.6 for
docbook files are not used deprecated functions from
DOCBparser, so 'libxml/DOCBparser.h' is not needed.
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit f4859ad13cd26b31e44d981bd0d55a9fa19c7aab)
Diffstat (limited to 'ConfigureChecks.cmake')
| -rw-r--r-- | ConfigureChecks.cmake | 15 |
1 files changed, 3 insertions, 12 deletions
diff --git a/ConfigureChecks.cmake b/ConfigureChecks.cmake index 6b936f76..6a0e50de 100644 --- a/ConfigureChecks.cmake +++ b/ConfigureChecks.cmake @@ -64,19 +64,10 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) ##### check for libxml-2.0 - pkg_search_module( LIBXML libxml-2.0 ) + pkg_search_module( LIBXML libxml-2.0>=2.6 ) if( NOT LIBXML_FOUND ) - tde_message_fatal( "libxml-2.0 is required but was not found on your system" ) - elseif( ${LIBXML_VERSION} VERSION_LESS "2.6" ) - tde_message_fatal( "libxml-2.0 version must be, at least, up to 2.6" ) - else() - set( LIBXML_2_5 1 ) - tde_save( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) - set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - set( CMAKE_REQUIRED_LIBRARIES ${LIBXML_LIBRARIES} ) - check_function_exists( xmlSetEntityReferenceFunc HAVE_INCLUDE_FIX ) - tde_restore( CMAKE_REQUIRED_INCLUDES CMAKE_REQUIRED_LIBRARIES ) + tde_message_fatal( "libxml-2.0 version >= 2.6 is required but was not found on your system" ) endif( NOT LIBXML_FOUND ) @@ -128,7 +119,7 @@ if( (BUILD_QUANTA) OR (BUILD_KXSLDBG) OR (BUILD_KLINKSTATUS) ) tde_save( CMAKE_REQUIRED_INCLUDES ) set( CMAKE_REQUIRED_INCLUDES ${LIBXML_INCLUDE_DIRS} ) - check_include_file( "libxml/DOCBparser.h" LIBXML_DOCB_ENABLED ) + set( LIBXML_DOCB_ENABLED 1 CACHE BOOL "Enable docbook input files" ) check_include_file( "libxml/xinclude.h" LIBXML_XINCLUDE_ENABLED ) tde_restore( CMAKE_REQUIRED_INCLUDES ) |