fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-25 12:58:11 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

CMake build system fix: Lets check for xmlto doc book generator first.

Browse source 
We shouldn't try to build the documentation with meinproc *and* xmlto.
Prefer xmlto, since it's also the one we use under Autotools.
We still need to support meinproc as a fallback, because xmlto isn't
available on Windows.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733
Reviewed-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
This commit is contained in:
Ralf Habacker 2013-01-28 19:55:10 +01:00
parent 3a600899d4
commit 1e1e4c92ac
1 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
cmake/doc/CMakeLists.txt
View file

@ -23,7 +23,12 @@ if (MEINPROC4_EXECUTABLE OR XMLTO_EXECUTABLE)
OPTION(DBUS_ENABLE_XML_DOCS "build XML documentation (requires xmlto or meinproc4)" ON)
endif (MEINPROC4_EXECUTABLE OR XMLTO_EXECUTABLE)
if (MEINPROC4_EXECUTABLE)
if (XMLTO_EXECUTABLE)
set (DOCBOOK_GENERATOR_NAME "xmlto" PARENT_SCOPE)
set(DBUS_XML_DOCS_ENABLED 1)
set(MEINPROC4_EXECUTABLE 0)
MESSAGE(STATUS "xmlto docbook generator found")
elseif (MEINPROC4_EXECUTABLE)
set(DOCBOOK_GENERATOR_NAME "meinproc4" PARENT_SCOPE)
set(DBUS_XML_DOCS_ENABLED 1)
if(WIN32)
@ -33,14 +38,7 @@ if (MEINPROC4_EXECUTABLE)
set(_meinproc_install_path ${CMAKE_INSTALL_PREFIX})
endif(WIN32)
set(STYLESHEET "${_meinproc_install_path}/share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl")
endif (MEINPROC4_EXECUTABLE)
if (XMLTO_EXECUTABLE)
set (DOCBOOK_GENERATOR_NAME "xmlto" PARENT_SCOPE)
set(DBUS_XML_DOCS_ENABLED 1)
MESSAGE(STATUS "xmlto docbook generator found")
endif (XMLTO_EXECUTABLE)
endif ()
if (DBUS_ENABLE_XML_DOCS)