From 95be475812349e24080db442bc908bacf6e8f5df Mon Sep 17 00:00:00 2001
From: Luigi Toscano <luigi.toscano@tiscali.it>
Date: Tue, 18 May 2010 23:04:45 +0000
Subject: Look for paths with encoded version only if needed

svn path=/trunk/KDE/kdelibs/; revision=1128329
---
 modules/FindDocBookXML.cmake | 30 +++++++++++++++++++-----------
 1 file changed, 19 insertions(+), 11 deletions(-)

(limited to 'modules/FindDocBookXML.cmake')

diff --git a/modules/FindDocBookXML.cmake b/modules/FindDocBookXML.cmake
index 51001877..b28f5b1a 100644
--- a/modules/FindDocBookXML.cmake
+++ b/modules/FindDocBookXML.cmake
@@ -27,22 +27,30 @@ set (DTD_PATH_LIST
    share/xml/docbook/${DOCBOOKXML_CURRENTDTD_VERSION}
 )
 
-# hacks for systems that use the package version in the DTD dirs,
-# e.g. Fedora, OpenSolaris
-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}
 )
 
+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}
+   )
+endif (NOT DOCBOOKXML_CURRENTDTD_DIR)
+
 #set (DOCBOOKXML_OLDDTD_DIR ${DOCBOOKXML_CURRENTDTD_DIR})
 #set (DOCBOOKXML_OLDDTD_VERSION "4.1.2")
 #set (DTD_PATH_LIST)
-- 
cgit v1.2.1