mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-28 19:25:27 +08:00
40449ff1cb
* fix issue #16215 * add more projects and fix issue #16222 * add version * exclude libc from default projects * remove libc, add fland to default projects * update to v11.1.0 * fix compiler-rt install path * fix SHA for version 11.1.0 * fix libc++ install * re-fix libc++ install * fix pstl install * fix flang's license file name * install tools in tools/llvm, fix file names * revert bin directory for libraries * don't create clang sub-directory in llvm/tools * overwrite version * copy tool dependencies * overwrite version * remove vcpkg_copy_tools call * overwrite version * restore default features * overwrite version * overwrite version * convert manifest to json * install usage files * overwrite version * remove feature `default-projects` * modernize CMake in usage files * overwrite version * update ordering * override version
137 lines
6.4 KiB
Diff
137 lines
6.4 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 d233f552f01f..26f502ad2d23 100644
|
|
--- a/clang/cmake/modules/CMakeLists.txt
|
|
+++ b/clang/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(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 4822124ca412..1ca3eff8f14e 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 fa505a533762..90413be34120 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 b74adc11ade9..0638aea2f8f6 100644
|
|
--- a/llvm/cmake/modules/AddLLVM.cmake
|
|
+++ b/llvm/cmake/modules/AddLLVM.cmake
|
|
@@ -974,7 +974,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 4b8879f65fe4..9e097ab223b5 100644
|
|
--- a/llvm/cmake/modules/CMakeLists.txt
|
|
+++ b/llvm/cmake/modules/CMakeLists.txt
|
|
@@ -1,4 +1,4 @@
|
|
-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 b9fb9adce2ea..85a54f699f30 100644
|
|
--- a/mlir/cmake/modules/CMakeLists.txt
|
|
+++ b/mlir/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(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 211f95512717..2abe3803f910 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 8e6e1354707b..2ae7f7090025 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)
|