aboutsummaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorRalf Habacker <ralf.habacker@freenet.de>2006-02-11 20:48:29 +0000
committerRalf Habacker <ralf.habacker@freenet.de>2006-02-11 20:48:29 +0000
commitbce40e0de3b22a291ecaa2b75358e6a998e1579b (patch)
tree74dbf56fd48f03cbce0739f655e431a1a64cb9bb /modules
parentcf46a70c5cc373e23ea2075c2a2fb0e41cfffe96 (diff)
downloadextra-cmake-modules-bce40e0de3b22a291ecaa2b75358e6a998e1579b.tar.gz
extra-cmake-modules-bce40e0de3b22a291ecaa2b75358e6a998e1579b.tar.bz2
workaround for detecting libxml2 on windows when using a path list in CMAKE_INCLUDE_PATH
svn path=/trunk/KDE/kdelibs/; revision=508470
Diffstat (limited to 'modules')
-rw-r--r--modules/FindLibXml2.cmake27
1 files changed, 10 insertions, 17 deletions
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake
index 122e2f8c..b40635c8 100644
--- a/modules/FindLibXml2.cmake
+++ b/modules/FindLibXml2.cmake
@@ -15,23 +15,16 @@ INCLUDE(UsePkgConfig)
PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags)
SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags})
-
-FIND_PATH(LIBXML2_ROOT_INCLUDE_DIR libxml2/libxml/xpath.h
- ${_LibXml2IncDir}
- /usr/include
- /usr/local/include
-)
-
-SET(LIBXML2_INCLUDE_DIR ${LIBXML2_ROOT_INCLUDE_DIR}/libxml2 CACHE PATH "LibXml2 include directory")
-
-MARK_AS_ADVANCED(LIBXML2_ROOT_INCLUDE_DIR)
-
-FIND_LIBRARY(LIBXML2_LIBRARY NAMES xml2 libxml2
- PATHS
- ${_LibXml2LinkDir}
- /usr/lib
- /usr/local/lib
-)
+
+# this is a hack dealing with lists in CMAKE_INCLUDE_PATH
+foreach(incDir ${CMAKE_INCLUDE_PATH})
+ FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h
+ ${incDir}/libxml2
+ ${_LibXml2IncDir}/libxml2
+ /usr/include/libxml2
+ /usr/local/include/libxml2
+ )
+endforeach(incDir ${CMAKE_INCLUDE_PATH})
IF(LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARY)
SET(LIBXML2_FOUND TRUE)