[cfe-commits] r170225 - in /cfe/trunk: CMakeLists.txt tools/c-index-test/CMakeLists.txt

[NAKAMURA Takumi]

Author: chapuni
Date: Fri Dec 14 12:30:20 2012
New Revision: 170225

URL: http://llvm.org/viewvc/llvm-project?rev=170225&view=rev
Log:
[CMake] Move libxml2 stuff from clang to llvm/cmake.

Modified:
    cfe/trunk/CMakeLists.txt
    cfe/trunk/tools/c-index-test/CMakeLists.txt

Modified: cfe/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=170225&r1=170224&r2=170225&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Fri Dec 14 12:30:20 2012
@@ -139,10 +139,6 @@
   set(CMAKE_MODULE_LINKER_FLAGS "-Wl,-flat_namespace -Wl,-undefined -Wl,suppress")
 endif ()
 
-# libxml2 is an optional dependency, required only to run validation
-# tests on XML output.
-find_package(LibXml2)
-
 configure_file(
   ${CLANG_SOURCE_DIR}/include/clang/Config/config.h.cmake
   ${CLANG_BINARY_DIR}/include/clang/Config/config.h)

Modified: cfe/trunk/tools/c-index-test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/c-index-test/CMakeLists.txt?rev=170225&r1=170224&r2=170225&view=diff
==============================================================================
--- cfe/trunk/tools/c-index-test/CMakeLists.txt (original)
+++ cfe/trunk/tools/c-index-test/CMakeLists.txt Fri Dec 14 12:30:20 2012
@@ -23,8 +23,7 @@
   LINKER_LANGUAGE CXX)
 
 # If libxml2 is available, make it available for c-index-test.
-if (LIBXML2_FOUND)
-  add_definitions(${LIBXML2_DEFINITIONS} "-DCLANG_HAVE_LIBXML")
+if (CLANG_HAVE_LIBXML)
   include_directories(${LIBXML2_INCLUDE_DIR})
   target_link_libraries(c-index-test ${LIBXML2_LIBRARIES})
 endif()