Attachment 75713 Details for Bug 61637 – CMake linux fixes when using meinproc4 doc generator.

[patch] CMake linux fixes when using meinproc4 doc generator.

7158925aa9c3816fbc53c4b705eaab25951f0b5f.patch (text/plain), 1.78 KB, created by Ralf Habacker on 2013-02-28 21:38:50 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2013-02-28 21:38:50 UTC

Size: 1.78 KB

patch

obsolete

>From 7158925aa9c3816fbc53c4b705eaab25951f0b5f Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Thu, 28 Feb 2013 12:22:33 +0000
>Subject: CMake linux fixes when using meinproc4 doc generator.
>
>---
>diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
>index 15c0540..dee9431 100644
>--- a/cmake/doc/CMakeLists.txt
>+++ b/cmake/doc/CMakeLists.txt
>@@ -28,16 +28,19 @@ if (XMLTO_EXECUTABLE)
> 	set(DBUS_XML_DOCS_ENABLED 1)
> 	set(MEINPROC4_EXECUTABLE 0)
> 	MESSAGE(STATUS "xmlto docbook generator found")
>+	set(STYLESHEET_MAN "${DOCBOOKXSL_DIR}/manpages/docbook.xsl")
>+	set(STYLESHEET_HTML "${DOCBOOKXSL_DIR}/html/docbook.xsl")
>+
> elseif (MEINPROC4_EXECUTABLE)
> 	set(DOCBOOK_GENERATOR_NAME "meinproc4" PARENT_SCOPE)
> 	set(DBUS_XML_DOCS_ENABLED 1)
> 	if(WIN32)
> 		get_filename_component(_a ${MEINPROC4_EXECUTABLE} PATH)
> 		get_filename_component(_meinproc_install_path ${_a} PATH)
>+		set(STYLESHEET_HTML "${_meinproc_install_path}/share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl")
> 	else(WIN32)
>-		set(_meinproc_install_path ${CMAKE_INSTALL_PREFIX})
>+		set(STYLESHEET_HTML file:///usr/share/kde4/apps/ksgmltools2/customization/kde-nochunk.xsl)
> 	endif(WIN32)
>-	set(STYLESHEET "${_meinproc_install_path}/share/apps/ksgmltools2/docbook/xsl/html/docbook.xsl")
> endif ()
> 
> if (DBUS_ENABLE_XML_DOCS)
>@@ -48,10 +51,10 @@ macro (DOCBOOK _sources _format)
> 
>   if (${_format} STREQUAL "man")
>     string(REPLACE ".xml" "" _outname ${_name})
>-    set(STYLESHEET "${DOCBOOKXSL_DIR}/manpages/docbook.xsl")
>+    set(STYLESHEET ${STYLESHEET_MAN})
>   else()
>     string(REPLACE ".xml" ".html" _outname ${_name})
>-    set(STYLESHEET "${DOCBOOKXSL_DIR}/html/docbook.xsl")
>+    set(STYLESHEET ${STYLESHEET_HTML})
>   endif ()
> 
>   set(_outfile ${CMAKE_CURRENT_BINARY_DIR}/${_outname})
>--
>cgit v0.9.0.2-2-gbebe

Actions: View | Splinter Review

Attachments on bug 61637: 75712 | 75713 | 75898 | 77120

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.