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

Merge branch 'fix-issue-377' into 'master'

Browse source 
cmake: fix for ninja phony cycle related configuring errors

Closes #377

See merge request dbus/dbus!253
This commit is contained in:
Simon McVittie 2022-02-17 14:57:23 +00:00
commit 817e1c6e5d
1 changed files with 55 additions and 54 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

109
doc/CMakeLists.txt
View file

@ -96,50 +96,63 @@ if(DBUS_ENABLE_XML_DOCS)
#
# generate docbook file from template
#
macro(generate_docbook_file a b)
get_filename_component(outname ${b} NAME)
set(srcfile ${CMAKE_CURRENT_SOURCE_DIR}/${a})
# @param _infile docbook source template file
# @param _outfile generated docbook source file
#
macro(generate_docbook_file _infile _outfile)
get_filename_component(outname ${_outfile} NAME)
set(srcfile ${CMAKE_CURRENT_SOURCE_DIR}/${_infile})
set(tmpfile ${CMAKE_CURRENT_BINARY_DIR}/${outname}.tmp.cmake)
file(WRITE ${tmpfile} "
set(EXPANDED_SYSCONFDIR ${CMAKE_INSTALL_FULL_SYSCONFDIR})
set(EXPANDED_DATADIR ${CMAKE_INSTALL_FULL_DATADIR})
set(DBUS_VERSION ${DBUS_VERSION})
configure_file(${srcfile} ${b})
configure_file(${srcfile} ${_outfile})
")
add_custom_command(OUTPUT ${b}
COMMAND ${CMAKE_COMMAND} -E remove ${b}
add_custom_command(OUTPUT ${_outfile}
COMMAND ${CMAKE_COMMAND} -E remove ${_outfile}
COMMAND ${CMAKE_COMMAND} -P ${tmpfile}
DEPENDS ${srcfile} ${CMAKE_BINARY_DIR}/CMakeCache.txt
COMMENT "Generating ${outname}"
)
add_custom_target(${outname} DEPENDS ${b})
add_dependencies(doc ${outname})
add_custom_target(xmldoc-${outname} DEPENDS ${_outfile})
endmacro()
macro(DOCBOOK _sources _format)
get_filename_component(_infile ${_sources} ABSOLUTE)
#
# generate docbook file from source
#
# @param _source docbook xml source file
# @param FORMATS <formats> list with output formats to generate ('html' and/or 'man')
#
macro(DOCBOOK _source)
set(options)
set(oneValueArgs)
set(multiValueArgs FORMATS)
cmake_parse_arguments(ARGS "${options}" "${oneValueArgs}" "${multiValueArgs}" ${ARGN})
get_filename_component(_infile ${_source} ABSOLUTE)
get_filename_component(_name ${_infile} NAME)
if(${_format} STREQUAL "man")
string(REPLACE ".xml" "" _outname ${_name})
set(STYLESHEET "${DOCBOOKXSL_DIR}/manpages/docbook.xsl")
else()
string(REPLACE ".xml" ".html" _outname ${_name})
set(STYLESHEET "${DOCBOOKXSL_DIR}/html/docbook.xsl")
endif()
set(_outfile ${CMAKE_CURRENT_BINARY_DIR}/${_outname})
add_custom_command(
OUTPUT ${_outfile}
COMMAND ${XSLTPROC_EXECUTABLE} --output ${_outfile} --nonet --xinclude --param passivetex.extensions '1' --param generate.consistent.ids '1' ${STYLESHEET} ${_infile}
DEPENDS ${XSLTPROC_EXECUTABLE} ${_infile}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_target(${_outname} DEPENDS ${_outfile})
add_dependencies(xmldoc ${_outname})
if(${_format} STREQUAL "man")
install(FILES ${_outfile} DESTINATION ${CMAKE_INSTALL_DATADIR}/man/man1)
else()
install(FILES ${_outfile} DESTINATION ${CMAKE_INSTALL_DATADIR}/doc/dbus)
endif()
foreach(_format ${ARGS_FORMATS})
if(${_format} STREQUAL "man")
string(REPLACE ".xml" "" _outname ${_name})
set(STYLESHEET "${DOCBOOKXSL_DIR}/manpages/docbook.xsl")
set(INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/man/man1)
else()
string(REPLACE ".xml" ".html" _outname ${_name})
set(STYLESHEET "${DOCBOOKXSL_DIR}/html/docbook.xsl")
set(INSTALL_DIR ${CMAKE_INSTALL_DATADIR}/doc/dbus)
endif()
set(_outfile ${CMAKE_CURRENT_BINARY_DIR}/${_outname})
add_custom_command(
OUTPUT ${_outfile}
COMMAND ${XSLTPROC_EXECUTABLE} --output ${_outfile} --nonet --xinclude --param passivetex.extensions '1' --param generate.consistent.ids '1' ${STYLESHEET} ${_infile}
DEPENDS ${XSLTPROC_EXECUTABLE} ${_infile}
WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}
)
add_custom_target(xmldoc-${_outname} DEPENDS ${_outfile})
add_dependencies(xmldoc xmldoc-${_outname})
install(FILES ${_outfile} DESTINATION ${INSTALL_DIR})
endforeach()
endmacro()
### copy tests to builddir so that generated tests and static tests
@ -175,31 +188,19 @@ generate_docbook_file(dbus-test-tool.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-t
generate_docbook_file(dbus-update-activation-environment.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml)
generate_docbook_file(dbus-uuidgen.1.xml.in ${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml)
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-test-plan.xml html)
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-tutorial.xml html)
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-specification.xml html)
docbook(${CMAKE_CURRENT_SOURCE_DIR}/dbus-faq.xml html)
set(formats html)
if(UNIX)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-run-session.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml man)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml man)
list(APPEND formats man)
endif()
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-run-session.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml html)
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-cleanup-sockets.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-daemon.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-launch.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-monitor.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-run-session.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-send.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-test-tool.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-uuidgen.1.xml FORMATS ${formats})
docbook(${CMAKE_CURRENT_BINARY_DIR}/dbus-update-activation-environment.1.xml FORMATS ${formats})
#
# handle html index file