diff options
| author | Ralf Habacker <ralf.habacker@freenet.de> | 2006-04-08 22:43:16 +0000 |
|---|---|---|
| committer | Ralf Habacker <ralf.habacker@freenet.de> | 2006-04-08 22:43:16 +0000 |
| commit | cba8933a83c2e96698b85b980438f30385f8420e (patch) | |
| tree | a419a92b1d833f8396bf1497354d5998528feac5 /modules/FindLibXml2.cmake | |
| parent | e9e6c0db0f483f2cdbceb69cbb76974189e15cde (diff) | |
| download | extra-cmake-modules-cba8933a83c2e96698b85b980438f30385f8420e.tar.gz extra-cmake-modules-cba8933a83c2e96698b85b980438f30385f8420e.tar.bz2 | |
optimized gnuwin32 detection on windows
- find gnuwin32 package location very early
- removed GNUWIN32_INCLUDE_DIR/GNUWIN32_LIBRARY_DIR macros, because FindGNUWIN32.cmake
sets now CMAKE_INCLUDE_PATH and CMAKE_LIBRARY_PATH
- don't use pkgconfig on windows
svn path=/trunk/KDE/kdelibs/; revision=527634
Diffstat (limited to 'modules/FindLibXml2.cmake')
| -rw-r--r-- | modules/FindLibXml2.cmake | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/modules/FindLibXml2.cmake b/modules/FindLibXml2.cmake index a5d8ab17..deb09c65 100644 --- a/modules/FindLibXml2.cmake +++ b/modules/FindLibXml2.cmake @@ -7,18 +7,13 @@ # LIBXML2_DEFINITIONS - Compiler switches required for using LibXml2 # -IF (WIN32) - FIND_PACKAGE(GNUWIN32) - SET(_LibXml2IncDir ${GNUWIN32_DIR}/include) - SET(_LibXml2LinkDir ${GNUWIN32_DIR}/lib) -ELSE (WIN32) +IF (NOT WIN32) # use pkg-config to get the directories and then use these values # in the FIND_PATH() and FIND_LIBRARY() calls INCLUDE(UsePkgConfig) PKGCONFIG(libxml-2.0 _LibXml2IncDir _LibXml2LinkDir _LibXml2LinkFlags _LibXml2Cflags) -ENDIF (WIN32) - -set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) + set(LIBXML2_DEFINITIONS ${_LibXml2Cflags}) +ENDIF (NOT WIN32) FIND_PATH(LIBXML2_INCLUDE_DIR libxml/xpath.h PATHS |