2021-06-30 02:08:28 +03:00
|
|
|
clang/tools/c-index-test/CMakeLists.txt | 6 +-----
|
|
|
|
lldb/cmake/modules/LLDBConfig.cmake | 2 +-
|
|
|
|
2 files changed, 2 insertions(+), 6 deletions(-)
|
|
|
|
|
|
|
|
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
|
2021-12-20 19:21:15 +03:00
|
|
|
index ceef4b08637c..40b9e995597f 100644
|
2021-06-30 02:08:28 +03:00
|
|
|
--- a/clang/tools/c-index-test/CMakeLists.txt
|
|
|
|
+++ b/clang/tools/c-index-test/CMakeLists.txt
|
|
|
|
@@ -40,11 +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()
|
|
|
|
+ include_directories(SYSTEM ${LIBXML2_INCLUDE_DIRS})
|
|
|
|
target_link_libraries(c-index-test PRIVATE ${LIBXML2_LIBRARIES})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
diff --git a/lldb/cmake/modules/LLDBConfig.cmake b/lldb/cmake/modules/LLDBConfig.cmake
|
2021-12-20 19:21:15 +03:00
|
|
|
index b62cd7d24438..a8c78ee1bccd 100644
|
2021-06-30 02:08:28 +03:00
|
|
|
--- a/lldb/cmake/modules/LLDBConfig.cmake
|
|
|
|
+++ b/lldb/cmake/modules/LLDBConfig.cmake
|
2021-12-20 19:21:15 +03:00
|
|
|
@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA)
|
2021-06-30 02:08:28 +03:00
|
|
|
endif()
|
|
|
|
|
|
|
|
if (LLDB_ENABLE_LIBXML2)
|
|
|
|
- include_directories(${LIBXML2_INCLUDE_DIR})
|
|
|
|
+ include_directories(${LIBXML2_INCLUDE_DIRS})
|
|
|
|
endif()
|
|
|
|
|
|
|
|
include_directories(BEFORE
|