diff options
| -rw-r--r-- | attic/modules/FindDocBookXML.cmake | 44 | ||||
| -rw-r--r-- | attic/modules/FindDocBookXSL.cmake | 34 |
2 files changed, 39 insertions, 39 deletions
diff --git a/attic/modules/FindDocBookXML.cmake b/attic/modules/FindDocBookXML.cmake index 54b4f9fd..d64ce471 100644 --- a/attic/modules/FindDocBookXML.cmake +++ b/attic/modules/FindDocBookXML.cmake @@ -16,34 +16,34 @@ 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} + 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} + 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_CURRENTDTD_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} - ) + # 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_CURRENTDTD_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) diff --git a/attic/modules/FindDocBookXSL.cmake b/attic/modules/FindDocBookXSL.cmake index 8ea3bb48..39502cce 100644 --- a/attic/modules/FindDocBookXSL.cmake +++ b/attic/modules/FindDocBookXSL.cmake @@ -21,26 +21,26 @@ set (STYLESHEET_PATH_LIST ) find_path (DocBookXSL_DIR lib/lib.xsl - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES ${STYLESHEET_PATH_LIST} + 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} - ) + # 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 () |