From: Brad King <brad.king@kitware.com>
Date: Wed, 16 Dec 2009 13:52:05 +0000 (-0500)
Subject: Isolate libxml header check
X-Git-Tag: v2.8.0~73
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b8c67f228d97b88069b5aaa51474d79db697898;p=thirdparty%2Flibarchive.git

Isolate libxml header check

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
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a19391b2f..2728a14d7 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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)
   #