From 402025260c2a8fddfabd642c979deac99b8cdf60 Mon Sep 17 00:00:00 2001 From: Alexander Neundorf Date: Tue, 21 Mar 2006 20:11:33 +0000 Subject: -change FindLibXml2.cmake to the new enhanced cmake style by using PATH_SUFFIXES for linux/bsd/OS X developers this shouldn't change anything ...but for the windows developers it should ! So: for the stuff which comes from gnuwin32: set the environment variable CMAKE_LIBRARY_PATH to the directory where the gnuwin32 libs are located and set CMAKE_INCLUDE_PATH to the directory where the gnuwin32 headers are installed to. Please let me know whether this works for. So, don't set CMAKE_INCLUDE_PATH to the directory which contains libxml/xpath.h, but to the one which contains libxml2/libxml/xpath.h This should make writing the FindSomething.cmake modules much easier. CCMAIL: kde-buildsystem@kde.org CCMAIL: Ch.Ehrlicher@gmx.de CCMAIL: ralf.habacker@freenet.de CCMAIL: syntheticpp@gmx.net Alex svn path=/trunk/KDE/kdelibs/; revision=521183 --- modules/FindLibXml2.cmake | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'modules') diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index d6214d76..7bc10d79 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -16,21 +16,15 @@ PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cf set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -FIND_PACKAGE(GNUWIN32) - FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - ${_LibXml2IncDir}/libxml2 - /usr/include/libxml2 - /usr/local/include/libxml2 - ${GNUWIN32_DIR}/include/libxml2 + PATHS + ${_LibXml2IncDir} + PATH_SUFFIXES libxml2 ) FIND_LIBRARY(LIBXML2_LIBRARIES NAMES xml2 libxml2 PATHS ${_LibXml2LinkDir} - /usr/lib - /usr/local/lib - ${GNUWIN32_DIR}/lib ) if (LIBXML2_INCLUDE_DIR AND LIBXML2_LIBRARIES) -- cgit v1.2.1