KDE/kdelibs/cmake/modules

[Ralf Habacker]

Alexander Neundorf schrieb:
> SVN commit 521183 by neundorf:
>
>
> -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.
>   
Couldn't set the FIND_PACKAGE(GNUWIN32) macro set these variables 
automatically ?  It was really nice to have this macro, because no user 
adjustment was required and it seems this seems to be lost by this patch.

Ralf


> 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 at kde.org
> CCMAIL: Ch.Ehrlicher at gmx.de
> CCMAIL: ralf.habacker at freenet.de
> CCMAIL: syntheticpp at gmx.net
>
> Alex
>
>
>
>
>  M  +3 -9      FindLibXml2.cmake  
>
>
> --- trunk/KDE/kdelibs/cmake/modules/FindLibXml2.cmake #521182:521183
> @@ -16,21 +16,15 @@
>  
>  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)
>