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

Make documentation generating MSYS/MSYS2-compatible

Browse source 
xmlto is a shell script, it needs to be fed MSYSsy filenames.
This patch adds a cygpath invocation for filename conversion (autotools do
that automatically, for CMake you have to spell it out). Cygwpath is available
in MSYS2 (and Cygwin, obviously).
When cygpath is not available, use MSYS-specific pwd extension to get W32 path.

Bug: https://bugs.freedesktop.org/show_bug.cgi?id=75860
Reviewed-by: Ralf Habacker <ralf.habacker@freenet.de>
This commit is contained in:
Руслан Ижбулатов 2014-03-06 23:17:13 +00:00 • committed by Ralf Habacker
parent d40025871a
commit d274bd42fe
1 changed files with 15 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
cmake/doc/CMakeLists.txt
View file

@ -20,6 +20,8 @@ find_program(MEINPROC4_EXECUTABLE meinproc4)
find_program(XMLTO_EXECUTABLE xmlto)
find_program(CYGPATH_EXECUTABLE cygpath)
if (MEINPROC4_EXECUTABLE OR XMLTO_EXECUTABLE)
OPTION(DBUS_ENABLE_XML_DOCS "build XML documentation (requires xmlto or meinproc4)" ON)
ADD_CUSTOM_TARGET(xmldoc ALL)
@ -71,6 +73,19 @@ macro (DOCBOOK _sources _format)
)
endif ()
if (XMLTO_EXECUTABLE)
if (MSYS)
if (CYGPATH_EXECUTABLE)
execute_process(
COMMAND cygpath ${_infile}
OUTPUT_VARIABLE _infile)
else ()
execute_process(COMMAND dirname ${_infile} OUTPUT_VARIABLE _path)
string(STRIP ${_path} _path)
execute_process(COMMAND sh -c "cd ${_path}; pwd -W" OUTPUT_VARIABLE _path)
string(STRIP ${_path} _path)
set(_infile "${_path}/${_name}")
endif(CYGPATH_EXECUTABLE)
endif (MSYS)
ADD_CUSTOM_COMMAND(
OUTPUT ${_outfile}
COMMAND ${XMLTO_EXECUTABLE} -vv ${_format} ${_infile}