diff options
author | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 20:19:59 +0000 |
---|---|---|
committer | Alexander Neundorf <neundorf@kde.org> | 2006-02-11 20:19:59 +0000 |
commit | cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96 (patch) | |
tree | 5d87d914c0e3dcbd002b484accb5305784af61eb /modules/FindLibXml2.cmake | |
parent | 48ba4c4ffbcdfc8eb9c4ddcb96742163efc13802 (diff) | |
download | extra-cmake-modules-cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96.tar.gz extra-cmake-modules-cf46a70c5cc373e23ea2075c2a2fb0e41cfffe96.tar.bz2 |
-changed kde4_create_libtool_file (target dir_relative_to_libdir)
to kde4_install_libtool_file(dir_relative_to_install_prefix target)
-added variable KDE4_PLUGIN_INSTALL_DIR, used usually for installing plugins
-changed am2cmake accordingly
-edited FindLibXml2.cmake and FindLibArt so that they work correctly with CMAKE_INSTALL_PATH
-changed generated_findpackage_file accordingly
-some minor formatting changes
Alex
CCMAIL: montel@kde.org
svn path=/trunk/KDE/kdelibs/; revision=508458
Diffstat (limited to 'modules/FindLibXml2.cmake')
-rw-r--r-- | modules/FindLibXml2.cmake | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index 5aade097..122e2f8c 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -16,13 +16,16 @@ PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cf SET(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) -FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h - ${CMAKE_INCLUDE_PATH}/libxml2 - ${_LibXml2IncDir}/libxml2 - /usr/include/libxml2 - /usr/local/include/libxml2 +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} |