KDE/kdelibs/cmake/modules

Alexander Neundorf neundorf at kde.org
Tue May 11 18:35:30 CEST 2010


On Tuesday 11 May 2010, Allen Winter wrote:
> SVN commit 1125486 by winterz:
>
> Super-duper-hackarific for supporting Fedora12 and Fedora13.
> Older Fedoras will need to be added as required.
> Rex is talking to Fedora about this.
> CCMAIL: kde-buildsystem at kde.org
>
>
>  M  +10 -0     FindDocBookXML.cmake
>
>
> --- trunk/KDE/kdelibs/cmake/modules/FindDocBookXML.cmake #1125485:1125486
> @@ -29,6 +29,16 @@
>     share/xml/docbook/${DOCBOOKXML_CURRENTDTD_VERSION}
>  )
>
> +#hacks for Fedora
> +if(NOT ${DOCBOOKXML_CURRENTDTD_DIR})
> +find_path(DOCBOOKXML_CURRENTDTD_DIR catalog
> +   PATHS ${CMAKE_SYSTEM_PREFIX_PATH}
> +   PATH_SUFFIXES
> +   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})

You don't need the if() around that, find_path() anyway only does something if 
the variable (DOCBOOKXML_CURRENTDTD_DIR) is not already set to a valid value.

Actually I think you can put these additional search dirs probably directly 
into the already existing find_path() call, with the "NAMES" argument you can 
list multiple names, and we are already also listing multiple PATH_SUFFIXES.

Alex


More information about the Kde-buildsystem mailing list