[PATCH] Adding LZMA as dep for XML2 on 2.8.0 or higher

[Renato Golin]

  Adding cross-compiler check for lzma addition

Hi chandlerc, doug.gregor,

http://llvm-reviews.chandlerc.com/D1604

CHANGE SINCE LAST DIFF
  http://llvm-reviews.chandlerc.com/D1604?vs=4057&id=4156#toc

Files:
  cmake/config-ix.cmake

Index: cmake/config-ix.cmake
===================================================================
--- cmake/config-ix.cmake
+++ cmake/config-ix.cmake
@@ -300,6 +300,20 @@
 find_package(LibXml2)
 if (LIBXML2_FOUND)
   set(CLANG_HAVE_LIBXML 1)
+  # When cross-compiling, liblzma is not detected as a dependency for libxml2,
+  # which makes linking c-index-test fail. But for native builds, all libraries
+  # are installed and checked by CMake before Makefiles are generated and everything
+  # works according to the plan. However, if a -llzma is added to native builds,
+  # an additional requirement on the static liblzma.a is required, but will not
+  # be checked by CMake, breaking native compilation.
+  # Since this is only pertinent to cross-compilations, and there's no way CMake
+  # can check for every foreign library on every OS, we add the dep and warn the dev.
+  if ( DEFINED CMAKE_CROSSCOMPILING )
+    if (NOT PC_LIBXML_VERSION VERSION_LESS "2.8.0")
+      message(STATUS "Adding LZMA as a dep to XML2 for cross-compilation, make sure liblzma.a is available.")
+      set(LIBXML2_LIBRARIES ${LIBXML2_LIBRARIES} "-llzma")
+    endif ()
+  endif ( CMAKE_CROSSCOMPILING )
 endif ()
 
 include(CheckCXXCompilerFlag)
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D1604.2.patch
Type: text/x-patch
Size: 1229 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20130910/8fe5b23a/attachment.bin>