Attachment 73789 Details for Bug 59733 – check for xmlto first in cmake build systems

[patch] check for xmlto first in cmake build systems

0001-CMake-build-system-fix-Lets-check-for-xmlto-doc-book.patch (text/plain), 1.58 KB, created by Ralf Habacker on 2013-01-28 19:03:18 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Ralf Habacker

Created: 2013-01-28 19:03:18 UTC

Size: 1.58 KB

patch

obsolete

>From 398d1f159b7d255b41d3493abf2fa27237ccca99 Mon Sep 17 00:00:00 2001
>From: Ralf Habacker <ralf.habacker@freenet.de>
>Date: Mon, 28 Jan 2013 19:55:10 +0100
>Subject: [PATCH] CMake build system fix: Lets check for xmlto doc book
> generator first.
>
>Bug: https://bugs.freedesktop.org/show_bug.cgi?id=59733
>---
> cmake/doc/CMakeLists.txt |   16 +++++++---------
> 1 Datei geÃ¤ndert, 7 Zeilen hinzugefÃ¼gt(+), 9 Zeilen entfernt(-)
>
>diff --git a/cmake/doc/CMakeLists.txt b/cmake/doc/CMakeLists.txt
>index df6b587..e107918 100644
>--- a/cmake/doc/CMakeLists.txt
>+++ b/cmake/doc/CMakeLists.txt
>@@ -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)
> 
>-- 
>1.7.10.4
>

Actions: View | Splinter Review

Attachments on bug 59733: 73480 | 73683 | 73789 | 73790 | 73791 | 73867 | 74083 | 74927 | 75078 | 78609

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.