]> git.ipfire.org Git - thirdparty/libarchive.git/commitdiff
Isolate libxml header check
authorBrad King <brad.king@kitware.com>
Wed, 16 Dec 2009 13:52:05 +0000 (08:52 -0500)
committerBrad King <brad.king@kitware.com>
Wed, 16 Dec 2009 13:52:05 +0000 (08:52 -0500)
The check HAVE_LIBXML_XMLREADER_H should not use LA_CHECK_INCLUDE_FILE
because it sets CMAKE_REQUIRED_INCLUDES for only the one check.  The
LA_CHECK_INCLUDE_FILE macro accumulates headers that exist for use in
future checks, but including libxml/xmlreader.h breaks later checks
because they do not set CMAKE_REQUIRED_INCLUDES.  Instead we use
CHECK_INCLUDE_FILES directly for this check.

SVN-Revision: 1751

CMakeLists.txt

index a19391b2ffa1a0c8e5ca6fa6117d364b223deadc..2728a14d7143379c56e76270f6686ee6c3262a83 100644 (file)
@@ -342,7 +342,7 @@ IF(LIBXML2_FOUND)
   # "libxml/xmlreader.h".
   FIND_PATH(ICONV_INCLUDE_DIR iconv.h)
   SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR})
-  LA_CHECK_INCLUDE_FILE("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H)
+  CHECK_INCLUDE_FILES("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H)
   SET(CMAKE_REQUIRED_INCLUDES "")
 ELSE(LIBXML2_FOUND)
   #