From kde-commits Tue Mar 04 22:33:46 2014 From: Alex Merry Date: Tue, 04 Mar 2014 22:33:46 +0000 To: kde-commits Subject: [kde4support] cmake: Remove FindDocBook*.cmake files so they can be reimported Message-Id: X-MARC-Message: https://marc.info/?l=kde-commits&m=139397390228086 Git commit 6ed15646d876ef4bef22ff2439eed8caf3a8a4a7 by Alex Merry. Committed on 24/02/2014 at 13:26. Pushed by ltoscano into branch 'master'. Remove FindDocBook*.cmake files so they can be reimported I curtailed the history import last time; let's try again. Commit 3029791cff02f7904b9af465f4cfe98be00eaa82 in kdoctools D +0 -59 cmake/FindDocBookXML.cmake http://commits.kde.org/kde4support/6ed15646d876ef4bef22ff2439eed8caf3a8a4a7 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, -# -# 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)