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>
139 lines
6.5 KiB
Diff
139 lines
6.5 KiB
Diff
clang/cmake/modules/CMakeLists.txt | 4 ++--
|
|
flang/cmake/modules/CMakeLists.txt | 4 ++--
|
|
lld/cmake/modules/CMakeLists.txt | 4 ++--
|
|
llvm/cmake/modules/AddLLVM.cmake | 2 +-
|
|
llvm/cmake/modules/CMakeLists.txt | 2 +-
|
|
mlir/cmake/modules/CMakeLists.txt | 4 ++--
|
|
polly/cmake/CMakeLists.txt | 4 ++--
|
|
pstl/CMakeLists.txt | 4 ++--
|
|
8 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt
|
|
index 561665d58cad..3c73878a4483 100644
|
|
--- a/clang/cmake/modules/CMakeLists.txt
|
|
+++ b/clang/cmake/modules/CMakeLists.txt
|
|
@@ -3,11 +3,11 @@ include(LLVMDistributionSupport)
|
|
# Generate a list of CMake library targets so that other CMake projects can
|
|
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
|
|
# the usual CMake convention seems to be ${Project}Targets.cmake.
|
|
-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
|
|
+set(CLANG_INSTALL_PACKAGE_DIR share/clang)
|
|
set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
|
|
|
|
# Keep this in sync with llvm/cmake/CMakeLists.txt!
|
|
-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
|
|
get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
|
|
diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt
|
|
index e46498a6bc35..2e922f8ca89d 100644
|
|
--- a/flang/cmake/modules/CMakeLists.txt
|
|
+++ b/flang/cmake/modules/CMakeLists.txt
|
|
@@ -1,11 +1,11 @@
|
|
# Generate a list of CMake library targets so that other CMake projects can
|
|
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
|
|
# the usual CMake convention seems to be ${Project}Targets.cmake.
|
|
-set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang)
|
|
+set(FLANG_INSTALL_PACKAGE_DIR share/flang)
|
|
set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}")
|
|
|
|
# Keep this in sync with llvm/cmake/CMakeLists.txt!
|
|
-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
|
|
get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS)
|
|
diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt
|
|
index 62d03fa901dd..09b0f54ee8c3 100644
|
|
--- a/lld/cmake/modules/CMakeLists.txt
|
|
+++ b/lld/cmake/modules/CMakeLists.txt
|
|
@@ -1,11 +1,11 @@
|
|
# Generate a list of CMake library targets so that other CMake projects can
|
|
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
|
|
# the usual CMake convention seems to be ${Project}Targets.cmake.
|
|
-set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld)
|
|
+set(LLD_INSTALL_PACKAGE_DIR share/lld)
|
|
set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}")
|
|
|
|
# Keep this in sync with llvm/cmake/CMakeLists.txt!
|
|
-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
|
|
get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS)
|
|
diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
|
|
index 29e40f45fef8..e9094e9b8eb2 100644
|
|
--- a/llvm/cmake/modules/AddLLVM.cmake
|
|
+++ b/llvm/cmake/modules/AddLLVM.cmake
|
|
@@ -1033,7 +1033,7 @@ function(process_llvm_pass_plugins)
|
|
|
|
## Part 1: Extension header to be included whenever we need extension
|
|
# processing.
|
|
- set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+ set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
file(WRITE
|
|
"${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
|
|
diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
|
|
index 51b6a4fdc284..a818de2e116c 100644
|
|
--- a/llvm/cmake/modules/CMakeLists.txt
|
|
+++ b/llvm/cmake/modules/CMakeLists.txt
|
|
@@ -1,6 +1,6 @@
|
|
include(LLVMDistributionSupport)
|
|
|
|
-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
|
|
# First for users who use an installed LLVM, create the LLVMExports.cmake file.
|
|
diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt
|
|
index 65efc4a14987..7c3213ab0c2b 100644
|
|
--- a/mlir/cmake/modules/CMakeLists.txt
|
|
+++ b/mlir/cmake/modules/CMakeLists.txt
|
|
@@ -3,11 +3,11 @@ include(LLVMDistributionSupport)
|
|
# Generate a list of CMake library targets so that other CMake projects can
|
|
# link against them. LLVM calls its version of this file LLVMExports.cmake, but
|
|
# the usual CMake convention seems to be ${Project}Targets.cmake.
|
|
-set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir)
|
|
+set(MLIR_INSTALL_PACKAGE_DIR share/mlir)
|
|
set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}")
|
|
|
|
# Keep this in sync with llvm/cmake/CMakeLists.txt!
|
|
-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
|
|
|
|
get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS)
|
|
diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt
|
|
index 7cc129ba2e90..9776391cd535 100644
|
|
--- a/polly/cmake/CMakeLists.txt
|
|
+++ b/polly/cmake/CMakeLists.txt
|
|
@@ -1,7 +1,7 @@
|
|
# Keep this in sync with llvm/cmake/CMakeLists.txt!
|
|
|
|
-set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
|
|
-set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly")
|
|
+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
|
|
+set(POLLY_INSTALL_PACKAGE_DIR share/polly)
|
|
if (CMAKE_CONFIGURATION_TYPES)
|
|
set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake")
|
|
else()
|
|
diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt
|
|
index 8bea8843589b..3658c0a4414a 100644
|
|
--- a/pstl/CMakeLists.txt
|
|
+++ b/pstl/CMakeLists.txt
|
|
@@ -81,10 +81,10 @@ install(TARGETS ParallelSTL
|
|
install(EXPORT ParallelSTLTargets
|
|
FILE ParallelSTLTargets.cmake
|
|
NAMESPACE pstl::
|
|
- DESTINATION lib/cmake/ParallelSTL)
|
|
+ DESTINATION share/ParallelSTL)
|
|
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"
|
|
"${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake"
|
|
- DESTINATION lib/cmake/ParallelSTL)
|
|
+ DESTINATION share/ParallelSTL)
|
|
install(DIRECTORY include/
|
|
DESTINATION include
|
|
PATTERN "*.in" EXCLUDE)
|