mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 14:29:03 +08:00
c482408411
* [llvm] update to 12.0.0, enable zlib and libxml2 * [llvm] disable libxml2 by default, arm64-windows should be supported * [llvm] try to fix build with ffi on Windows #17663 * [llvm] re-enable libxml2 * [llvm] fix formatting * [llvm] overwrite version * [mesa] update to v21.1.0 * [llvm] update ci.baseline * [halide] update to the latest master commit * [llvm] disable libxml2 port until complete PR #15390 * update versions * [llvm] fix disabling of external libraries * update version * update ci.baseline * update ci.baseline * fix typo * [llvm] fix libxml2 (depends on #17945) * revert "[halide] update to the latest master commit" * update versions * [halide] fix zlib dependency for tools * update versions * [halide] update to official release v12.0.0 * update versions * [halide] update to v12.0.1 * update version * [mesa] remove llvm from defaults * update version * update ci.baseline * [mesa] update to v21.1.2 and fix build with LLVM on Windows * [llvm] allow to build libunwind project on Windows * update versions * [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495
35 lines
1.3 KiB
Diff
35 lines
1.3 KiB
Diff
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
|
|
index ceef4b086..40b9e9955 100644
|
|
--- 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
|
|
index 2fdf1502d..beeeeb9b1 100644
|
|
--- a/lldb/cmake/modules/LLDBConfig.cmake
|
|
+++ b/lldb/cmake/modules/LLDBConfig.cmake
|
|
@@ -214,7 +214,7 @@ if (LLDB_ENABLE_LZMA)
|
|
endif()
|
|
|
|
if (LLDB_ENABLE_LIBXML2)
|
|
- include_directories(${LIBXML2_INCLUDE_DIR})
|
|
+ include_directories(${LIBXML2_INCLUDE_DIRS})
|
|
endif()
|
|
|
|
include_directories(BEFORE
|