From a087c957d6e0e31ca745670d6c22146315e470c8 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Mon, 10 May 2010 21:21:02 +0000 Subject: New dependencies: DocBook XML, DocBook XSL. Approved on kde-core-devel and kde-buildsystem. This is the first step to remove the embedded (outdated) copies of DocBook XML DTDs and DocBook XSL stylesheet from kdelibs/kdoctools. svn path=/trunk/KDE/kdelibs/; revision=1125172 --- modules/FindDocBookXSL.cmake | 25 +++++++++++++++++++++++++ 1 file changed, 25 insertions(+) create mode 100644 modules/FindDocBookXSL.cmake (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake new file mode 100644 index 00000000..44f69699 --- /dev/null +++ b/modules/FindDocBookXSL.cmake @@ -0,0 +1,25 @@ +# Try to find DocBook XSL stylesheet +# Once done, it will define: +# +# DOCBOOKXSL_FOUND - system has the required DocBook XML DTDs +# DOCBOOKXSL_DIR - the directory containing the stylesheets +# used to process DocBook XML +# +# Copyright (c) 2010, Luigi Toscano, +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. + +find_path (DOCBOOKXSL_DIR VERSION + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES + share/xml/docbook/stylesheet/docbook-xsl + share/sgml/docbook/xsl-stylesheets + share/xml/docbook/stylesheet/nwalsh/current +) + +find_package_handle_standard_args (DocBookXSL + "Could NOT find DocBook XSL stylesheets" + DOCBOOKXSL_DIR) + +mark_as_advanced (DOCBOOKXSL_DIR) -- cgit v1.2.1 From f5a7eacec19610c37514bc28c5553b215dd81372 Mon Sep 17 00:00:00 2001 From: Dawit Alemayehu Date: Fri, 14 May 2010 04:31:59 +0000 Subject: Fix the location detection of docbook xsl style sheet in platforms that use version number in the path names, e.g. ArchLinux. svn path=/trunk/KDE/kdelibs/; revision=1126482 --- modules/FindDocBookXSL.cmake | 20 ++++++++++++++++---- 1 file changed, 16 insertions(+), 4 deletions(-) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 44f69699..60ce2e70 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -10,12 +10,24 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. +set (STYLESHEET_PATH_LIST + share/xml/docbook/stylesheet/docbook-xsl + share/sgml/docbook/xsl-stylesheets + share/xml/docbook/stylesheet/nwalsh/current +) + +foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) + file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} + ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-* + ) + if (STYLESHEET_SUFFIX_ITER) + list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) + endif () +endforeach () + find_path (DOCBOOKXSL_DIR VERSION PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES - share/xml/docbook/stylesheet/docbook-xsl - share/sgml/docbook/xsl-stylesheets - share/xml/docbook/stylesheet/nwalsh/current + PATH_SUFFIXES ${STYLESHEET_PATH_LIST} ) find_package_handle_standard_args (DocBookXSL -- cgit v1.2.1 From 550897d01e2b6059ff79cea98d9b3ed44f064d83 Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 18 May 2010 22:28:23 +0000 Subject: Add missing include(FindPackageHandleStandardArgs) svn path=/trunk/KDE/kdelibs/; revision=1128313 --- modules/FindDocBookXSL.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 60ce2e70..c84f2888 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -30,6 +30,7 @@ find_path (DOCBOOKXSL_DIR VERSION PATH_SUFFIXES ${STYLESHEET_PATH_LIST} ) +include(FindPackageHandleStandardArgs) find_package_handle_standard_args (DocBookXSL "Could NOT find DocBook XSL stylesheets" DOCBOOKXSL_DIR) -- cgit v1.2.1 From 95be475812349e24080db442bc908bacf6e8f5df Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Tue, 18 May 2010 23:04:45 +0000 Subject: Look for paths with encoded version only if needed svn path=/trunk/KDE/kdelibs/; revision=1128329 --- modules/FindDocBookXSL.cmake | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index c84f2888..7c1f3ff3 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -16,20 +16,30 @@ set (STYLESHEET_PATH_LIST share/xml/docbook/stylesheet/nwalsh/current ) -foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) - file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} - ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-* - ) - if (STYLESHEET_SUFFIX_ITER) - list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) - endif () -endforeach () - find_path (DOCBOOKXSL_DIR VERSION PATHS ${CMAKE_SYSTEM_PREFIX_PATH} PATH_SUFFIXES ${STYLESHEET_PATH_LIST} ) +if (NOT DOCBOOKXSL_DIR) + # hacks for systems that put the version in the stylesheet dirs + set (STYLESHEET_PATH_LIST) + foreach (STYLESHEET_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH}) + file(GLOB STYLESHEET_SUFFIX_ITER RELATIVE ${STYLESHEET_PREFIX_ITER} + ${STYLESHEET_PREFIX_ITER}/share/xml/docbook/xsl-stylesheets-* + ) + if (STYLESHEET_SUFFIX_ITER) + list (APPEND STYLESHEET_PATH_LIST ${STYLESHEET_SUFFIX_ITER}) + endif () + endforeach () + + find_path (DOCBOOKXSL_DIR VERSION + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + PATH_SUFFIXES ${STYLESHEET_PATH_LIST} + ) +endif (NOT DOCBOOKXSL_DIR) + + include(FindPackageHandleStandardArgs) find_package_handle_standard_args (DocBookXSL "Could NOT find DocBook XSL stylesheets" -- cgit v1.2.1 From 3cc6956201aed4440477ba33bf5dd1b0c77bed11 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 26 May 2010 17:02:16 +0000 Subject: -don't put the copyright notice in the documentation Alex svn path=/trunk/KDE/kdelibs/; revision=1130873 --- modules/FindDocBookXSL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 7c1f3ff3..380c8709 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -4,7 +4,7 @@ # DOCBOOKXSL_FOUND - system has the required DocBook XML DTDs # DOCBOOKXSL_DIR - the directory containing the stylesheets # used to process DocBook XML -# + # Copyright (c) 2010, Luigi Toscano, # # Redistribution and use is allowed according to the terms of the BSD license. -- cgit v1.2.1 From a80bc295f6ba0063a20fd5efc7121d5bed9182be Mon Sep 17 00:00:00 2001 From: Luigi Toscano Date: Wed, 26 May 2010 22:17:35 +0000 Subject: Use a less ambiguous file name to find xslt directory svn path=/trunk/KDE/kdelibs/; revision=1130971 --- modules/FindDocBookXSL.cmake | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 380c8709..d3968914 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -16,7 +16,7 @@ set (STYLESHEET_PATH_LIST share/xml/docbook/stylesheet/nwalsh/current ) -find_path (DOCBOOKXSL_DIR VERSION +find_path (DOCBOOKXSL_DIR lib/lib.xsl PATHS ${CMAKE_SYSTEM_PREFIX_PATH} PATH_SUFFIXES ${STYLESHEET_PATH_LIST} ) -- cgit v1.2.1 From 3ff273540a558ab9d98a0cc760b255323742308b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Andr=C3=A9=20W=C3=B6bbeking?= Date: Mon, 31 May 2010 20:55:05 +0000 Subject: Make it also work with Debian Lenny CCMAIL:luigi.toscano@tiscali.it svn path=/trunk/KDE/kdelibs/; revision=1132995 --- modules/FindDocBookXSL.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index d3968914..2a20bbe8 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -14,6 +14,7 @@ set (STYLESHEET_PATH_LIST share/xml/docbook/stylesheet/docbook-xsl share/sgml/docbook/xsl-stylesheets share/xml/docbook/stylesheet/nwalsh/current + share/xml/docbook/stylesheet/nwalsh ) find_path (DOCBOOKXSL_DIR lib/lib.xsl -- cgit v1.2.1 From 81c41f4b3b7b93e461e6ccb94c67d4f60d091e50 Mon Sep 17 00:00:00 2001 From: Raphael Kubo da Costa Date: Wed, 2 Jun 2010 16:07:26 +0000 Subject: Add FreeBSD's path for DocBook XSL stylesheet. CCMAIL: luigi.toscano@tiscali.it svn path=/trunk/KDE/kdelibs/; revision=1133834 --- modules/FindDocBookXSL.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 2a20bbe8..4d52c41a 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -15,6 +15,7 @@ set (STYLESHEET_PATH_LIST share/sgml/docbook/xsl-stylesheets share/xml/docbook/stylesheet/nwalsh/current share/xml/docbook/stylesheet/nwalsh + share/xsl/docbook ) find_path (DOCBOOKXSL_DIR lib/lib.xsl -- cgit v1.2.1 From 8ee68189221ecd8390de20b3857f33033d2657e3 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Wed, 30 Jun 2010 17:44:13 +0000 Subject: find docbook xsl also on slackware Alex svn path=/trunk/KDE/kdelibs/; revision=1144744 --- modules/FindDocBookXSL.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index 4d52c41a..cc273d52 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -12,6 +12,7 @@ set (STYLESHEET_PATH_LIST share/xml/docbook/stylesheet/docbook-xsl + share/xml/docbook/xsl-stylesheets share/sgml/docbook/xsl-stylesheets share/xml/docbook/stylesheet/nwalsh/current share/xml/docbook/stylesheet/nwalsh -- cgit v1.2.1 From 5c576da85fa28526d4cad8e822e3ed972efa8e16 Mon Sep 17 00:00:00 2001 From: Kurt Hindenburg Date: Sun, 17 Oct 2010 18:45:49 +0000 Subject: Add directory for MacOSX with macports installed. OK per luigi.toscano@tiscali.it svn path=/trunk/KDE/kdelibs/; revision=1186851 --- modules/FindDocBookXSL.cmake | 1 + 1 file changed, 1 insertion(+) (limited to 'modules/FindDocBookXSL.cmake') diff --git a/modules/FindDocBookXSL.cmake b/modules/FindDocBookXSL.cmake index cc273d52..ab93c9ec 100644 --- a/modules/FindDocBookXSL.cmake +++ b/modules/FindDocBookXSL.cmake @@ -17,6 +17,7 @@ set (STYLESHEET_PATH_LIST share/xml/docbook/stylesheet/nwalsh/current share/xml/docbook/stylesheet/nwalsh share/xsl/docbook + share/xsl/docbook-xsl ) find_path (DOCBOOKXSL_DIR lib/lib.xsl -- cgit v1.2.1