Author: Markus Böck Date: 2021-09-25T13:13:11+02:00 New Revision: 0b61f43b6096a9e98652991cba34e8ad44d35101
URL: https://github.com/llvm/llvm-project/commit/0b61f43b6096a9e98652991cba34e8ad44d35101 DIFF: https://github.com/llvm/llvm-project/commit/0b61f43b6096a9e98652991cba34e8ad44d35101.diff LOG: [CMake] Consistently use the LibXml2::LibXml2 target instead of LIBXML2_LIBRARIES Linking against the LibXml2::LibXml2 target has the advantage of not only importing the library, but also adding the include path as well as any definitions the library requires. In case of a static build of libxml2, eg. a define is set on Windows to remove any DLL imports and export. LLVM already makes use of the target, but c-index-test and lldb were still linking against the library only. The workaround for Mac OS-X that I removed seems to have also been made redundant since https://reviews.llvm.org/D84563 I believe Differential Revision: https://reviews.llvm.org/D109975 Added: Modified: clang/tools/c-index-test/CMakeLists.txt lldb/source/Host/CMakeLists.txt Removed: ################################################################################ diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt index ceef4b08637cc..99c6081db2d63 100644 --- a/clang/tools/c-index-test/CMakeLists.txt +++ b/clang/tools/c-index-test/CMakeLists.txt @@ -40,12 +40,7 @@ set_target_properties(c-index-test # If libxml2 is available, make it available for c-index-test. if (CLANG_HAVE_LIBXML) - if ((CMAKE_OSX_SYSROOT) AND (EXISTS ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR})) - include_directories(SYSTEM ${CMAKE_OSX_SYSROOT}/${LIBXML2_INCLUDE_DIR}) - else() - include_directories(SYSTEM ${LIBXML2_INCLUDE_DIR}) - endif() - target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES}) + target_link_libraries(c-index-test PRIVATE LibXml2::LibXml2) endif() if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY) diff --git a/lldb/source/Host/CMakeLists.txt b/lldb/source/Host/CMakeLists.txt index a018fd6c183dc..c18e8ce004b08 100644 --- a/lldb/source/Host/CMakeLists.txt +++ b/lldb/source/Host/CMakeLists.txt @@ -137,7 +137,7 @@ if (CMAKE_SYSTEM_NAME MATCHES "NetBSD") list(APPEND EXTRA_LIBS kvm) endif() if (LLDB_ENABLE_LIBXML2) - list(APPEND EXTRA_LIBS ${LIBXML2_LIBRARIES}) + list(APPEND EXTRA_LIBS LibXml2::LibXml2) endif() if (HAVE_LIBDL) list(APPEND EXTRA_LIBS ${CMAKE_DL_LIBS}) _______________________________________________ lldb-commits mailing list lldb-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
