From af0e889e7e53e5e6b815ba0595bd3146f04fe3d6 Mon Sep 17 00:00:00 2001 From: NAKAMURA Takumi <geek4civic@gmail.com> Date: Fri, 14 Dec 2012 18:30:20 +0000 Subject: [PATCH] [CMake] Move libxml2 stuff from clang to llvm/cmake. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@170225 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 4 ---- tools/c-index-test/CMakeLists.txt | 3 +-- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index d7ffab98766..f7099ac7653 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -139,10 +139,6 @@ if (APPLE) 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) diff --git a/tools/c-index-test/CMakeLists.txt b/tools/c-index-test/CMakeLists.txt index 6f28c546cf3..d90dc6d95c3 100644 --- a/tools/c-index-test/CMakeLists.txt +++ b/tools/c-index-test/CMakeLists.txt @@ -23,8 +23,7 @@ set_target_properties(c-index-test 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() -- GitLab