mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-13 16:59:02 +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>
185 lines
7.2 KiB
Diff
185 lines
7.2 KiB
Diff
clang-tools-extra/modularize/CMakeLists.txt | 2 +-
|
|
clang/cmake/modules/AddClang.cmake | 2 +-
|
|
clang/tools/c-index-test/CMakeLists.txt | 2 +-
|
|
clang/tools/clang-format/CMakeLists.txt | 2 +-
|
|
clang/tools/scan-build/CMakeLists.txt | 2 +-
|
|
clang/tools/scan-view/CMakeLists.txt | 2 +-
|
|
clang/utils/hmaptool/CMakeLists.txt | 2 +-
|
|
flang/cmake/modules/AddFlang.cmake | 2 +-
|
|
flang/tools/f18/CMakeLists.txt | 4 ++--
|
|
flang/tools/flang-driver/CMakeLists.txt | 2 +-
|
|
lld/cmake/modules/AddLLD.cmake | 2 +-
|
|
lld/tools/lld/CMakeLists.txt | 2 +-
|
|
lldb/cmake/modules/AddLLDB.cmake | 2 +-
|
|
13 files changed, 14 insertions(+), 14 deletions(-)
|
|
|
|
diff --git a/clang-tools-extra/modularize/CMakeLists.txt b/clang-tools-extra/modularize/CMakeLists.txt
|
|
index 4caae81c49b6..8c459c51cc34 100644
|
|
--- a/clang-tools-extra/modularize/CMakeLists.txt
|
|
+++ b/clang-tools-extra/modularize/CMakeLists.txt
|
|
@@ -23,5 +23,5 @@ clang_target_link_libraries(modularize
|
|
)
|
|
|
|
install(TARGETS modularize
|
|
- RUNTIME DESTINATION bin
|
|
+ RUNTIME DESTINATION tools/llvm
|
|
COMPONENT clang-extras)
|
|
diff --git a/clang/cmake/modules/AddClang.cmake b/clang/cmake/modules/AddClang.cmake
|
|
index 5752f4277444..00b7d21b8fef 100644
|
|
--- a/clang/cmake/modules/AddClang.cmake
|
|
+++ b/clang/cmake/modules/AddClang.cmake
|
|
@@ -159,7 +159,7 @@ macro(add_clang_tool name)
|
|
get_target_export_arg(${name} Clang export_to_clangtargets)
|
|
install(TARGETS ${name}
|
|
${export_to_clangtargets}
|
|
- RUNTIME DESTINATION bin
|
|
+ RUNTIME DESTINATION tools/llvm
|
|
COMPONENT ${name})
|
|
|
|
if(NOT LLVM_ENABLE_IDE)
|
|
diff --git a/clang/tools/c-index-test/CMakeLists.txt b/clang/tools/c-index-test/CMakeLists.txt
|
|
index ceef4b08637c..ce6d7799475b 100644
|
|
--- a/clang/tools/c-index-test/CMakeLists.txt
|
|
+++ b/clang/tools/c-index-test/CMakeLists.txt
|
|
@@ -54,7 +54,7 @@ if (NOT LLVM_INSTALL_TOOLCHAIN_ONLY)
|
|
set_property(TARGET c-index-test APPEND PROPERTY INSTALL_RPATH
|
|
"@executable_path/../../lib")
|
|
else()
|
|
- set(INSTALL_DESTINATION bin)
|
|
+ set(INSTALL_DESTINATION tools/llvm)
|
|
endif()
|
|
|
|
install(TARGETS c-index-test
|
|
diff --git a/clang/tools/clang-format/CMakeLists.txt b/clang/tools/clang-format/CMakeLists.txt
|
|
index 35ecdb11253c..d1b800dfdadc 100644
|
|
--- a/clang/tools/clang-format/CMakeLists.txt
|
|
+++ b/clang/tools/clang-format/CMakeLists.txt
|
|
@@ -36,5 +36,5 @@ install(PROGRAMS clang-format.py
|
|
DESTINATION share/clang
|
|
COMPONENT clang-format)
|
|
install(PROGRAMS git-clang-format
|
|
- DESTINATION bin
|
|
+ DESTINATION tools/llvm
|
|
COMPONENT clang-format)
|
|
diff --git a/clang/tools/scan-build/CMakeLists.txt b/clang/tools/scan-build/CMakeLists.txt
|
|
index ec0702d76f18..9a34a09921b1 100644
|
|
--- a/clang/tools/scan-build/CMakeLists.txt
|
|
+++ b/clang/tools/scan-build/CMakeLists.txt
|
|
@@ -47,7 +47,7 @@ if(CLANG_INSTALL_SCANBUILD)
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
|
|
install(PROGRAMS bin/${BinFile}
|
|
- DESTINATION bin
|
|
+ DESTINATION tools/llvm
|
|
COMPONENT scan-build)
|
|
endforeach()
|
|
|
|
diff --git a/clang/tools/scan-view/CMakeLists.txt b/clang/tools/scan-view/CMakeLists.txt
|
|
index eccc6b83195b..232976c0c227 100644
|
|
--- a/clang/tools/scan-view/CMakeLists.txt
|
|
+++ b/clang/tools/scan-view/CMakeLists.txt
|
|
@@ -20,7 +20,7 @@ if(CLANG_INSTALL_SCANVIEW)
|
|
DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/bin/${BinFile})
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/bin/${BinFile})
|
|
install(PROGRAMS bin/${BinFile}
|
|
- DESTINATION bin
|
|
+ DESTINATION tools/llvm
|
|
COMPONENT scan-view)
|
|
endforeach()
|
|
|
|
diff --git a/clang/utils/hmaptool/CMakeLists.txt b/clang/utils/hmaptool/CMakeLists.txt
|
|
index 62f2de0cb15c..38dc821c76de 100644
|
|
--- a/clang/utils/hmaptool/CMakeLists.txt
|
|
+++ b/clang/utils/hmaptool/CMakeLists.txt
|
|
@@ -10,7 +10,7 @@ add_custom_command(OUTPUT ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HM
|
|
|
|
list(APPEND Depends ${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/bin/${CLANG_HMAPTOOL})
|
|
install(PROGRAMS ${CLANG_HMAPTOOL}
|
|
- DESTINATION bin
|
|
+ DESTINATION tools/llvm
|
|
COMPONENT hmaptool)
|
|
|
|
add_custom_target(hmaptool ALL DEPENDS ${Depends})
|
|
diff --git a/flang/cmake/modules/AddFlang.cmake b/flang/cmake/modules/AddFlang.cmake
|
|
index 5da58a59ed12..c019d7fc50a9 100644
|
|
--- a/flang/cmake/modules/AddFlang.cmake
|
|
+++ b/flang/cmake/modules/AddFlang.cmake
|
|
@@ -108,7 +108,7 @@ macro(add_flang_tool name)
|
|
get_target_export_arg(${name} Flang export_to_flangtargets)
|
|
install(TARGETS ${name}
|
|
${export_to_flangtargets}
|
|
- RUNTIME DESTINATION bin
|
|
+ RUNTIME DESTINATION tools/llvm
|
|
COMPONENT ${name})
|
|
|
|
if(NOT LLVM_ENABLE_IDE)
|
|
diff --git a/flang/tools/f18/CMakeLists.txt b/flang/tools/f18/CMakeLists.txt
|
|
index 239859b5e5b9..12d00f904f8a 100644
|
|
--- a/flang/tools/f18/CMakeLists.txt
|
|
+++ b/flang/tools/f18/CMakeLists.txt
|
|
@@ -60,7 +60,7 @@ endforeach()
|
|
|
|
add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
|
|
|
|
-install(TARGETS f18 DESTINATION bin)
|
|
+install(TARGETS f18 DESTINATION tools/llvm)
|
|
|
|
set(FLANG_DEFAULT_DRIVER "flang-new")
|
|
if (NOT FLANG_BUILD_NEW_DRIVER)
|
|
@@ -70,5 +70,5 @@ endif()
|
|
# This flang shell script will only work in a POSIX shell.
|
|
if (NOT WIN32)
|
|
configure_file(${CMAKE_CURRENT_SOURCE_DIR}/flang.in ${CMAKE_BINARY_DIR}/bin/flang @ONLY)
|
|
- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
|
|
+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm)
|
|
endif()
|
|
diff --git a/flang/tools/flang-driver/CMakeLists.txt b/flang/tools/flang-driver/CMakeLists.txt
|
|
index 4c7ad220d223..f4206913e76f 100644
|
|
--- a/flang/tools/flang-driver/CMakeLists.txt
|
|
+++ b/flang/tools/flang-driver/CMakeLists.txt
|
|
@@ -27,4 +27,4 @@ clang_target_link_libraries(flang-new
|
|
clangBasic
|
|
)
|
|
|
|
-install(TARGETS flang-new DESTINATION bin)
|
|
+install(TARGETS flang-new DESTINATION tools/llvm)
|
|
diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
|
|
index 9883475d1aa5..48e46586f387 100644
|
|
--- a/lld/cmake/modules/AddLLD.cmake
|
|
+++ b/lld/cmake/modules/AddLLD.cmake
|
|
@@ -46,7 +46,7 @@ macro(add_lld_tool name)
|
|
get_target_export_arg(${name} LLD export_to_lldtargets)
|
|
install(TARGETS ${name}
|
|
${export_to_lldtargets}
|
|
- RUNTIME DESTINATION bin
|
|
+ RUNTIME DESTINATION tools/llvm
|
|
COMPONENT ${name})
|
|
|
|
if(NOT CMAKE_CONFIGURATION_TYPES)
|
|
diff --git a/lld/tools/lld/CMakeLists.txt b/lld/tools/lld/CMakeLists.txt
|
|
index e77b2161a873..b325b934640c 100644
|
|
--- a/lld/tools/lld/CMakeLists.txt
|
|
+++ b/lld/tools/lld/CMakeLists.txt
|
|
@@ -21,7 +21,7 @@ target_link_libraries(lld
|
|
)
|
|
|
|
install(TARGETS lld
|
|
- RUNTIME DESTINATION bin)
|
|
+ RUNTIME DESTINATION tools/llvm)
|
|
|
|
if(NOT LLD_SYMLINKS_TO_CREATE)
|
|
set(LLD_SYMLINKS_TO_CREATE
|
|
diff --git a/lldb/cmake/modules/AddLLDB.cmake b/lldb/cmake/modules/AddLLDB.cmake
|
|
index 8be214a8509a..4a5d0fa39be3 100644
|
|
--- a/lldb/cmake/modules/AddLLDB.cmake
|
|
+++ b/lldb/cmake/modules/AddLLDB.cmake
|
|
@@ -187,7 +187,7 @@ function(add_lldb_executable name)
|
|
endif()
|
|
|
|
if(ARG_GENERATE_INSTALL)
|
|
- set(install_dest bin)
|
|
+ set(install_dest tools/llvm)
|
|
if(ARG_INSTALL_PREFIX)
|
|
set(install_dest ${ARG_INSTALL_PREFIX})
|
|
endif()
|