diff options
| author | Luigi Toscano <luigi.toscano@tiscali.it> | 2010-05-12 23:56:16 +0000 |
|---|---|---|
| committer | Luigi Toscano <luigi.toscano@tiscali.it> | 2010-05-12 23:56:16 +0000 |
| commit | 121693506b0439e408a9b9e9fa3a16abc5ccff65 (patch) | |
| tree | 0609a6c7c12c9e46a890d82fea3fdde1c5036261 | |
| parent | 5596ae8655380d7b8ec2548427f986f9939329ba (diff) | |
| download | extra-cmake-modules-121693506b0439e408a9b9e9fa3a16abc5ccff65.tar.gz extra-cmake-modules-121693506b0439e408a9b9e9fa3a16abc5ccff65.tar.bz2 | |
Make it working even with splitted catalogs
And also, more compact code
svn path=/trunk/KDE/kdelibs/; revision=1126024
| -rw-r--r-- | modules/FindDocBookXML.cmake | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/modules/FindDocBookXML.cmake b/modules/FindDocBookXML.cmake index c337e43a..3ed4a1d8 100644 --- a/modules/FindDocBookXML.cmake +++ b/modules/FindDocBookXML.cmake @@ -17,12 +17,10 @@ # Redistribution and use is allowed according to the terms of the BSD license. # For details see the accompanying COPYING-CMAKE-SCRIPTS file. -set (DOCBOOKXML_CURRENTDTD_VERSION "4.2" +set (DOCBOOKXML_CURRENTDTD_VERSION "4.2" CACHE INTERNAL "Required version of XML DTDs") -find_path (DOCBOOKXML_CURRENTDTD_DIR catalog.xml - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES +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} @@ -30,25 +28,29 @@ find_path (DOCBOOKXML_CURRENTDTD_DIR catalog.xml ) #hacks for Fedora -if(NOT ${DOCBOOKXML_CURRENTDTD_DIR}) -find_path(DOCBOOKXML_CURRENTDTD_DIR catalog - PATHS ${CMAKE_SYSTEM_PREFIX_PATH} - PATH_SUFFIXES +set (DTD_PATH_LIST ${DTD_PATH_LIST} share/sgml/docbook/xml-dtd-4.2-1.0-48.fc12 share/sgml/docbook/xml-dtd-4.2-1.0-50.fc13 ) -endif(NOT ${DOCBOOKXML_CURRENTDTD_DIR}) + +find_path (DOCBOOKXML_CURRENTDTD_DIR docbookx.dtd + PATHS ${CMAKE_SYSTEM_PREFIX_PATH} + + PATH_SUFFIXES ${DTD_PATH_LIST} +) #set (DOCBOOKXML_OLDDTD_DIR ${DOCBOOKXML_CURRENTDTD_DIR}) #set (DOCBOOKXML_OLDDTD_VERSION "4.1.2") -#find_path (DOCBOOKXML_OLDDTD_DIR catalog.xml -# PATHS ${CMAKE_SYSTEM_PREFIX_PATH} -# PATH_SUFFIXES +#set (DTD_PATH_LIST) # share/xml/docbook/schema/dtd/${DOCBOOKXML_OLDDTD_VERSION} # share/xml/docbook/xml-dtd-${DOCBOOKXML_OLDDTD_VERSION} # share/sgml/docbook/xml-dtd-${DOCBOOKXML_OLDDTD_VERSION} # share/xml/docbook/${DOCBOOKXML_OLDDTD_VERSION} #) +#find_path (DOCBOOKXML_OLDDTD_DIR docbookx.dtd +# PATHS ${CMAKE_SYSTEM_PREFIX_PATH} +# PATH_SUFFIXES ${DTD_PATH_LIST} +#) find_package_handle_standard_args (DocBookXML "Could NOT find DocBook XML DTDs (v${DOCBOOKXML_CURRENTDTD_VERSION})" |