From: Tim Kientzle Date: Sat, 6 Mar 2010 21:29:27 +0000 (-0500) Subject: Merge r2008 from trunk: Fix include of iconv.h X-Git-Tag: v2.8.1~3 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=66677aeccb349e766469c831e9fa71676c591355;p=thirdparty%2Flibarchive.git Merge r2008 from trunk: Fix include of iconv.h SVN-Revision: 2017 --- diff --git a/CMakeLists.txt b/CMakeLists.txt index 42dc9fee5..12249d936 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -345,6 +345,7 @@ IF(LIBXML2_FOUND) # We need a directory path of iconv.h so that it won't fail to check # "libxml/xmlreader.h". FIND_PATH(ICONV_INCLUDE_DIR iconv.h) + INCLUDE_DIRECTORIES(${ICONV_INCLUDE_DIR}) SET(CMAKE_REQUIRED_INCLUDES ${ICONV_INCLUDE_DIR} ${LIBXML2_INCLUDE_DIR}) CHECK_INCLUDE_FILES("libxml/xmlreader.h" HAVE_LIBXML_XMLREADER_H) SET(CMAKE_REQUIRED_INCLUDES "")