mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-25 10:59:00 +08:00
099507df39
* [llvm] update to 13.0.0 * add version * [llvm] rework processing of the CMake packages * update versions * [llvm] return patch to fix config paths * update version * [llvm] allow to build Flang on Windows * add version * [llvm] temporary enable Flang by default for test * update version * [llvm] fix Flang installation * update version * [llvm] try to fix Flang build * update version * [llvm] remove Flang from defaults and use Perl path * [halide] update to 13.0.0 * update versions * [mesa] update to v21.2.5 and fix build with LLVM 13 * [llvm] use version * update versions * [opencv4] fix build with Halide 13 * update version * update ci.baseline * [halide] update usage file * [llvm] update supports * update versions * [vcpkg-ci-llvm] add test port * [vcpkg-ci-llvm] rework test port * [vcpkg-ci-llvm] test more features * [halide] update to v13.0.1 * update version * [mesa] recover port version * update versions * [opencv4] update version * update version * Update opencv4.json * [halide] update to v13.0.2 and fix usage * update version * Update ports/halide/portfile.cmake Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com> * update version * enable LLVM ABI breaking checks to avoid Halide build fail Co-authored-by: Phoebe <20694052+PhoebeHui@users.noreply.github.com>
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 ceef4b08637c..40b9e995597f 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 b62cd7d24438..a8c78ee1bccd 100644
|
|
--- a/lldb/cmake/modules/LLDBConfig.cmake
|
|
+++ b/lldb/cmake/modules/LLDBConfig.cmake
|
|
@@ -215,7 +215,7 @@ if (LLDB_ENABLE_LZMA)
|
|
endif()
|
|
|
|
if (LLDB_ENABLE_LIBXML2)
|
|
- include_directories(${LIBXML2_INCLUDE_DIR})
|
|
+ include_directories(${LIBXML2_INCLUDE_DIRS})
|
|
endif()
|
|
|
|
include_directories(BEFORE
|