mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 05:17:50 +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>
45 lines
2.4 KiB
Diff
45 lines
2.4 KiB
Diff
clang/lib/Headers/CMakeLists.txt | 2 +-
|
|
clang/runtime/CMakeLists.txt | 2 +-
|
|
compiler-rt/cmake/base-config-ix.cmake | 2 +-
|
|
3 files changed, 3 insertions(+), 3 deletions(-)
|
|
|
|
diff --git a/clang/lib/Headers/CMakeLists.txt b/clang/lib/Headers/CMakeLists.txt
|
|
index 8131f6005dc2..9afef2e5a4e7 100644
|
|
--- a/clang/lib/Headers/CMakeLists.txt
|
|
+++ b/clang/lib/Headers/CMakeLists.txt
|
|
@@ -222,7 +222,7 @@ set_target_properties(clang-resource-headers PROPERTIES
|
|
FOLDER "Misc"
|
|
RUNTIME_OUTPUT_DIRECTORY "${output_dir}")
|
|
|
|
-set(header_install_dir lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}/include)
|
|
+set(header_install_dir tools/llvm/lib/clang/${CLANG_VERSION}/include)
|
|
|
|
install(
|
|
FILES ${files} ${generated_files}
|
|
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt
|
|
index 61b1c60bf590..c20a5a326f15 100644
|
|
--- a/clang/runtime/CMakeLists.txt
|
|
+++ b/clang/runtime/CMakeLists.txt
|
|
@@ -82,7 +82,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/)
|
|
-DLLVM_LIT_ARGS=${LLVM_LIT_ARGS}
|
|
-DCOMPILER_RT_OUTPUT_DIR=${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION}
|
|
-DCOMPILER_RT_EXEC_OUTPUT_DIR=${LLVM_RUNTIME_OUTPUT_INTDIR}
|
|
- -DCOMPILER_RT_INSTALL_PATH:PATH=lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION}
|
|
+ -DCOMPILER_RT_INSTALL_PATH:PATH=tools/llvm/lib/clang/${CLANG_VERSION}
|
|
-DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS}
|
|
-DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
|
|
-DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX}
|
|
diff --git a/compiler-rt/cmake/base-config-ix.cmake b/compiler-rt/cmake/base-config-ix.cmake
|
|
index c11342e68813..61bb52135c43 100644
|
|
--- a/compiler-rt/cmake/base-config-ix.cmake
|
|
+++ b/compiler-rt/cmake/base-config-ix.cmake
|
|
@@ -42,7 +42,7 @@ if (LLVM_TREE_AVAILABLE)
|
|
# Setup the paths where compiler-rt runtimes and headers should be stored.
|
|
set(COMPILER_RT_OUTPUT_DIR ${LLVM_LIBRARY_OUTPUT_INTDIR}/clang/${CLANG_VERSION})
|
|
set(COMPILER_RT_EXEC_OUTPUT_DIR ${LLVM_RUNTIME_OUTPUT_INTDIR})
|
|
- set(COMPILER_RT_INSTALL_PATH lib${LLVM_LIBDIR_SUFFIX}/clang/${CLANG_VERSION})
|
|
+ set(COMPILER_RT_INSTALL_PATH tools/llvm/lib/clang/${CLANG_VERSION})
|
|
option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
|
|
${LLVM_INCLUDE_TESTS})
|
|
option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered"
|