]> git.proxmox.com Git - ceph.git/blame - ceph/src/jaegertracing/opentelemetry-cpp/tools/vcpkg/ports/llvm/0002-fix-install-paths.patch
projects / ceph.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
update ceph source to reef 18.1.2
[ceph.git] / ceph / src / jaegertracing / opentelemetry-cpp / tools / vcpkg / ports / llvm / 0002-fix-install-paths.patch
CommitLineData
1e59de90
TL		 1 clang/cmake/modules/CMakeLists.txt | 4 ++--
2 flang/cmake/modules/CMakeLists.txt | 4 ++--
3 lld/cmake/modules/CMakeLists.txt | 4 ++--
4 llvm/cmake/modules/AddLLVM.cmake | 2 +-
5 llvm/cmake/modules/CMakeLists.txt | 2 +-
6 mlir/cmake/modules/CMakeLists.txt | 4 ++--
7 polly/cmake/CMakeLists.txt | 4 ++--
8 pstl/CMakeLists.txt | 4 ++--
9 8 files changed, 14 insertions(+), 14 deletions(-)
10
11diff --git a/clang/cmake/modules/CMakeLists.txt b/clang/cmake/modules/CMakeLists.txt
12index d233f552f01f..26f502ad2d23 100644
13--- a/clang/cmake/modules/CMakeLists.txt
14+++ b/clang/cmake/modules/CMakeLists.txt
15@@ -1,11 +1,11 @@
16 # Generate a list of CMake library targets so that other CMake projects can
17 # link against them. LLVM calls its version of this file LLVMExports.cmake, but
18 # the usual CMake convention seems to be ${Project}Targets.cmake.
19-set(CLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/clang)
20+set(CLANG_INSTALL_PACKAGE_DIR share/clang)
21 set(clang_cmake_builddir "${CMAKE_BINARY_DIR}/${CLANG_INSTALL_PACKAGE_DIR}")
22
23 # Keep this in sync with llvm/cmake/CMakeLists.txt!
24-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
25+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
26 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
27
28 get_property(CLANG_EXPORTS GLOBAL PROPERTY CLANG_EXPORTS)
29diff --git a/flang/cmake/modules/CMakeLists.txt b/flang/cmake/modules/CMakeLists.txt
30index 4822124ca412..1ca3eff8f14e 100644
31--- a/flang/cmake/modules/CMakeLists.txt
32+++ b/flang/cmake/modules/CMakeLists.txt
33@@ -1,11 +1,11 @@
34 # Generate a list of CMake library targets so that other CMake projects can
35 # link against them. LLVM calls its version of this file LLVMExports.cmake, but
36 # the usual CMake convention seems to be ${Project}Targets.cmake.
37-set(FLANG_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/flang)
38+set(FLANG_INSTALL_PACKAGE_DIR share/flang)
39 set(flang_cmake_builddir "${CMAKE_BINARY_DIR}/${FLANG_INSTALL_PACKAGE_DIR}")
40
41 # Keep this in sync with llvm/cmake/CMakeLists.txt!
42-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
43+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
44 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
45
46 get_property(FLANG_EXPORTS GLOBAL PROPERTY FLANG_EXPORTS)
47diff --git a/lld/cmake/modules/CMakeLists.txt b/lld/cmake/modules/CMakeLists.txt
48index fa505a533762..90413be34120 100644
49--- a/lld/cmake/modules/CMakeLists.txt
50+++ b/lld/cmake/modules/CMakeLists.txt
51@@ -1,11 +1,11 @@
52 # Generate a list of CMake library targets so that other CMake projects can
53 # link against them. LLVM calls its version of this file LLVMExports.cmake, but
54 # the usual CMake convention seems to be ${Project}Targets.cmake.
55-set(LLD_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/lld)
56+set(LLD_INSTALL_PACKAGE_DIR share/lld)
57 set(lld_cmake_builddir "${CMAKE_BINARY_DIR}/${LLD_INSTALL_PACKAGE_DIR}")
58
59 # Keep this in sync with llvm/cmake/CMakeLists.txt!
60-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
61+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
62 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
63
64 get_property(LLD_EXPORTS GLOBAL PROPERTY LLD_EXPORTS)
65diff --git a/llvm/cmake/modules/AddLLVM.cmake b/llvm/cmake/modules/AddLLVM.cmake
66index b74adc11ade9..0638aea2f8f6 100644
67--- a/llvm/cmake/modules/AddLLVM.cmake
68+++ b/llvm/cmake/modules/AddLLVM.cmake
69@@ -974,7 +974,7 @@ function(process_llvm_pass_plugins)
70
71 ## Part 1: Extension header to be included whenever we need extension
72 # processing.
73- set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
74+ set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
75 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
76 file(WRITE
77 "${llvm_cmake_builddir}/LLVMConfigExtensions.cmake"
78diff --git a/llvm/cmake/modules/CMakeLists.txt b/llvm/cmake/modules/CMakeLists.txt
79index 4b8879f65fe4..9e097ab223b5 100644
80--- a/llvm/cmake/modules/CMakeLists.txt
81+++ b/llvm/cmake/modules/CMakeLists.txt
82@@ -1,4 +1,4 @@
83-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
84+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
85 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
86
87 # First for users who use an installed LLVM, create the LLVMExports.cmake file.
88diff --git a/mlir/cmake/modules/CMakeLists.txt b/mlir/cmake/modules/CMakeLists.txt
89index b9fb9adce2ea..85a54f699f30 100644
90--- a/mlir/cmake/modules/CMakeLists.txt
91+++ b/mlir/cmake/modules/CMakeLists.txt
92@@ -1,11 +1,11 @@
93 # Generate a list of CMake library targets so that other CMake projects can
94 # link against them. LLVM calls its version of this file LLVMExports.cmake, but
95 # the usual CMake convention seems to be ${Project}Targets.cmake.
96-set(MLIR_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/mlir)
97+set(MLIR_INSTALL_PACKAGE_DIR share/mlir)
98 set(mlir_cmake_builddir "${CMAKE_BINARY_DIR}/${MLIR_INSTALL_PACKAGE_DIR}")
99
100 # Keep this in sync with llvm/cmake/CMakeLists.txt!
101-set(LLVM_INSTALL_PACKAGE_DIR lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm)
102+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
103 set(llvm_cmake_builddir "${LLVM_BINARY_DIR}/${LLVM_INSTALL_PACKAGE_DIR}")
104
105 get_property(MLIR_EXPORTS GLOBAL PROPERTY MLIR_EXPORTS)
106diff --git a/polly/cmake/CMakeLists.txt b/polly/cmake/CMakeLists.txt
107index 211f95512717..2abe3803f910 100644
108--- a/polly/cmake/CMakeLists.txt
109+++ b/polly/cmake/CMakeLists.txt
110@@ -1,7 +1,7 @@
111 # Keep this in sync with llvm/cmake/CMakeLists.txt!
112
113-set(LLVM_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/llvm")
114-set(POLLY_INSTALL_PACKAGE_DIR "lib${LLVM_LIBDIR_SUFFIX}/cmake/polly")
115+set(LLVM_INSTALL_PACKAGE_DIR share/llvm)
116+set(POLLY_INSTALL_PACKAGE_DIR share/polly)
117 if (CMAKE_CONFIGURATION_TYPES)
118 set(POLLY_EXPORTS_FILE_NAME "PollyExports-$<LOWER_CASE:$<CONFIG>>.cmake")
119 else()
120diff --git a/pstl/CMakeLists.txt b/pstl/CMakeLists.txt
121index 8e6e1354707b..2ae7f7090025 100644
122--- a/pstl/CMakeLists.txt
123+++ b/pstl/CMakeLists.txt
124@@ -81,10 +81,10 @@ install(TARGETS ParallelSTL
125 install(EXPORT ParallelSTLTargets
126 FILE ParallelSTLTargets.cmake
127 NAMESPACE pstl::
128- DESTINATION lib/cmake/ParallelSTL)
129+ DESTINATION share/ParallelSTL)
130 install(FILES "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfig.cmake"
131 "${CMAKE_CURRENT_BINARY_DIR}/ParallelSTLConfigVersion.cmake"
132- DESTINATION lib/cmake/ParallelSTL)
133+ DESTINATION share/ParallelSTL)
134 install(DIRECTORY include/
135 DESTINATION include
136 PATTERN "*.in" EXCLUDE)
Ceph