[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdoctools] /: Remove FindDocBook*.cmake files so they can be reimported
From:       Alex Merry <kde () randomguy3 ! me ! uk>
Date:       2014-02-25 17:46:01
Message-ID: E1WIM4v-0006zr-0P () scm ! kde ! org
[Download RAW message or body]

Git commit 3029791cff02f7904b9af465f4cfe98be00eaa82 by Alex Merry.
Committed on 24/02/2014 at 13:26.
Pushed by alexmerry into branch 'master'.

Remove FindDocBook*.cmake files so they can be reimported

I curtailed the history import last time; let's try again.

M  +1    -1    CMakeLists.txt
D  +0    -59   cmake/FindDocBookXML.cmake
D  +0    -56   cmake/FindDocBookXSL.cmake

http://commits.kde.org/kdoctools/3029791cff02f7904b9af465f4cfe98be00eaa82

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 5ad7099..d135e0c 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -4,7 +4,7 @@ project(KDocTools)
 =

 # ECM setup
 find_package(ECM 0.0.10 REQUIRED NO_MODULE)
-set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake ${ECM_MODULE_PATH}=
 ${ECM_KDE_MODULE_DIR})
+set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
 =

 include(FeatureSummary)
 include(ECMSetupVersion)
diff --git a/cmake/FindDocBookXML.cmake b/cmake/FindDocBookXML.cmake
deleted file mode 100644
index b6d623e..0000000
--- a/cmake/FindDocBookXML.cmake
+++ /dev/null
@@ -1,59 +0,0 @@
-# Try to find DocBook XML DTDs
-# Once done, it will define:
-#
-#  DocBookXML_FOUND - system has the required DocBook XML DTDs
-#  DocBookXML_CURRENTDTD_VERSION - the version of currently used DocBook X=
ML
-#     DTD
-#  DocBookXML_CURRENTDTD_DIR - the directory containing the definition of
-#     the currently used DocBook XML version
-
-# Copyright (c) 2010, Luigi Toscano, <luigi.toscano@tiscali.it>
-#
-# Redistribution and use is allowed according to the terms of the BSD lice=
nse.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-set (DocBookXML_CURRENTDTD_VERSION "4.2"
-     CACHE INTERNAL "Required version of XML DTDs")
-
-set (DTD_PATH_LIST
-    share/xml/docbook/schema/dtd/${DocBookXML_CURRENTDTD_VERSION}
-    share/xml/docbook/xml-dtd-${DocBookXML_CURRENTDTD_VERSION}
-    share/sgml/docbook/xml-dtd-${DocBookXML_CURRENTDTD_VERSION}
-    share/xml/docbook/${DocBookXML_CURRENTDTD_VERSION}
-)
-
-find_path (DocBookXML_CURRENTDTD_DIR docbookx.dtd
-    PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
-    PATH_SUFFIXES ${DTD_PATH_LIST}
-)
-
-if (NOT DocBookXML_CURRENTDTD_DIR)
-    # hacks for systems that use the package version in the DTD dirs,
-    # e.g. Fedora, OpenSolaris
-    set (DTD_PATH_LIST)
-    foreach (DTD_PREFIX_ITER ${CMAKE_SYSTEM_PREFIX_PATH})
-        file(GLOB DTD_SUFFIX_ITER RELATIVE ${DTD_PREFIX_ITER}
-            ${DTD_PREFIX_ITER}/share/sgml/docbook/xml-dtd-${DocBookXML_CUR=
RENTDTD_VERSION}-*
-        )
-        if (DTD_SUFFIX_ITER)
-            list (APPEND DTD_PATH_LIST ${DTD_SUFFIX_ITER})
-        endif ()
-    endforeach ()
-
-    find_path (DocBookXML_CURRENTDTD_DIR docbookx.dtd
-        PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
-        PATH_SUFFIXES ${DTD_PATH_LIST}
-    )
-endif ()
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args (DocBookXML
-    REQUIRED_VARS DocBookXML_CURRENTDTD_DIR DocBookXML_CURRENTDTD_VERSION
-    FOUND_VAR DocBookXML_FOUND)
-
-#maintain backwards compatibility
-set(DOCBOOKXML_FOUND ${DocBookXML_FOUND})
-set(DOCBOOKXML_CURRENTDTD_DIR ${DocBookXML_CURRENTDTD_DIR})
-set(DOCBOOKXML_CURRENTDTD_VERSION ${DocBookXML_CURRENTDTD_VERSION})
-
-mark_as_advanced (DocBookXML_CURRENTDTD_DIR DocBookXML_CURRENTDTD_VERSION)
diff --git a/cmake/FindDocBookXSL.cmake b/cmake/FindDocBookXSL.cmake
deleted file mode 100644
index a7320ae..0000000
--- a/cmake/FindDocBookXSL.cmake
+++ /dev/null
@@ -1,56 +0,0 @@
-# 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, <luigi.toscano@tiscali.it>
-#
-# Redistribution and use is allowed according to the terms of the BSD lice=
nse.
-# For details see the accompanying COPYING-CMAKE-SCRIPTS file.
-
-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
-    share/xsl/docbook
-    share/xsl/docbook-xsl
-)
-
-find_path (DocBookXSL_DIR lib/lib.xsl
-    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 ()
-
-
-include(FindPackageHandleStandardArgs)
-find_package_handle_standard_args (DocBookXSL
-    REQUIRED_VARS DocBookXSL_DIR
-    FOUND_VAR DocBookXSL_FOUND)
-
-#maintain backwards compatibility
-set(DOCBOOKXSL_FOUND ${DocBookXSL_FOUND})
-set(DOCBOOKXSL_DIR ${DocBookXSL_DIR})
-
-mark_as_advanced (DocBookXSL_DIR)

[prev in list] [next in list] [prev in thread] [next in thread]