diff options
| author | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-12-14 18:30:20 +0000 |
|---|---|---|
| committer | NAKAMURA Takumi <geek4civic@gmail.com> | 2012-12-14 18:30:20 +0000 |
| commit | 92eb254c3cd5376bc8a8c412bdd8c36d833a4e15 (patch) | |
| tree | 9db2f6030bf9146dfe8e8cce67001f4e0bb5596d | |
| parent | 7a73251dea6a86e7b1bf8a28dfb428b43fecba22 (diff) | |
| download | bcm5719-llvm-92eb254c3cd5376bc8a8c412bdd8c36d833a4e15.tar.gz bcm5719-llvm-92eb254c3cd5376bc8a8c412bdd8c36d833a4e15.zip | |
[CMake] Move libxml2 stuff from clang to llvm/cmake.
llvm-svn: 170225
| -rw-r--r-- | clang/CMakeLists.txt | 4 | ||||
| -rw-r--r-- | clang/tools/c-index-test/CMakeLists.txt | 3 | ||||
| -rwxr-xr-x | llvm/cmake/config-ix.cmake | 5 | ||||
| -rw-r--r-- | llvm/include/llvm/Config/config.h.cmake | 3 |
4 files changed, 9 insertions, 6 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index d7ffab98766..f7099ac7653 100644 --- a/clang/CMakeLists.txt +++ b/clang/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/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt index 6f28c546cf3..d90dc6d95c3 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/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() diff --git a/llvm/cmake/config-ix.cmake b/llvm/cmake/config-ix.cmake index fcd5dd55667..274de31c9ef 100755 --- a/llvm/cmake/config-ix.cmake +++ b/llvm/cmake/config-ix.cmake @@ -294,6 +294,11 @@ else() set(ENABLE_PIC 0) endif() +find_package(LibXml2) +if (LIBXML2_FOUND) + set(CLANG_HAVE_LIBXML 1) +endif () + include(CheckCXXCompilerFlag) check_cxx_compiler_flag("-Wno-variadic-macros" SUPPORTS_NO_VARIADIC_MACROS_FLAG) diff --git a/llvm/include/llvm/Config/config.h.cmake b/llvm/include/llvm/Config/config.h.cmake index ca641247299..ff765ccd373 100644 --- a/llvm/include/llvm/Config/config.h.cmake +++ b/llvm/include/llvm/Config/config.h.cmake @@ -6,6 +6,9 @@ /* Bug report URL. */ #define BUG_REPORT_URL "${BUG_REPORT_URL}" +/* Define if we have libxml2 */ +#cmakedefine CLANG_HAVE_LIBXML ${CLANG_HAVE_LIBXML} + /* Relative directory for resource files */ #define CLANG_RESOURCE_DIR "${CLANG_RESOURCE_DIR}" |
