mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-30 10:19:02 +08:00
c482408411
* [llvm] update to 12.0.0, enable zlib and libxml2 * [llvm] disable libxml2 by default, arm64-windows should be supported * [llvm] try to fix build with ffi on Windows #17663 * [llvm] re-enable libxml2 * [llvm] fix formatting * [llvm] overwrite version * [mesa] update to v21.1.0 * [llvm] update ci.baseline * [halide] update to the latest master commit * [llvm] disable libxml2 port until complete PR #15390 * update versions * [llvm] fix disabling of external libraries * update version * update ci.baseline * update ci.baseline * fix typo * [llvm] fix libxml2 (depends on #17945) * revert "[halide] update to the latest master commit" * update versions * [halide] fix zlib dependency for tools * update versions * [halide] update to official release v12.0.0 * update versions * [halide] update to v12.0.1 * update version * [mesa] remove llvm from defaults * update version * update ci.baseline * [mesa] update to v21.1.2 and fix build with LLVM on Windows * [llvm] allow to build libunwind project on Windows * update versions * [mesa] update ci.baseline.txt to disable x64-windows-static-md, may be fixed in the PR #18495
173 lines
6.5 KiB
Diff
173 lines
6.5 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 ++--
|
|
lld/cmake/modules/AddLLD.cmake | 2 +-
|
|
lld/tools/lld/CMakeLists.txt | 2 +-
|
|
lldb/cmake/modules/AddLLDB.cmake | 2 +-
|
|
12 files changed, 13 insertions(+), 13 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 704278a0e93b..e8a87f574474 100644
|
|
--- a/clang/cmake/modules/AddClang.cmake
|
|
+++ b/clang/cmake/modules/AddClang.cmake
|
|
@@ -170,7 +170,7 @@ macro(add_clang_tool name)
|
|
|
|
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 dd3d33439299..ded0b5530ad9 100644
|
|
--- a/clang/tools/scan-view/CMakeLists.txt
|
|
+++ b/clang/tools/scan-view/CMakeLists.txt
|
|
@@ -19,7 +19,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 ba36a234babf..1197a8d8ff32 100644
|
|
--- a/flang/cmake/modules/AddFlang.cmake
|
|
+++ b/flang/cmake/modules/AddFlang.cmake
|
|
@@ -119,7 +119,7 @@ macro(add_flang_tool name)
|
|
|
|
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 2e5350aecdc6..b4ab145846b5 100644
|
|
--- a/flang/tools/f18/CMakeLists.txt
|
|
+++ b/flang/tools/f18/CMakeLists.txt
|
|
@@ -63,12 +63,12 @@ endforeach()
|
|
|
|
add_custom_target(module_files ALL DEPENDS ${MODULE_FILES})
|
|
|
|
-install(TARGETS f18 DESTINATION bin)
|
|
+install(TARGETS f18 DESTINATION tools/llvm)
|
|
|
|
# This flang shell script will only work in a POSIX shell.
|
|
if (NOT WIN32)
|
|
file(COPY ${CMAKE_CURRENT_SOURCE_DIR}/flang
|
|
DESTINATION ${CMAKE_BINARY_DIR}/bin
|
|
FILE_PERMISSIONS OWNER_EXECUTE OWNER_READ OWNER_WRITE)
|
|
- install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION bin)
|
|
+ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/flang DESTINATION tools/llvm)
|
|
endif()
|
|
diff --git a/lld/cmake/modules/AddLLD.cmake b/lld/cmake/modules/AddLLD.cmake
|
|
index 23df41312403..86f4eafeed07 100644
|
|
--- a/lld/cmake/modules/AddLLD.cmake
|
|
+++ b/lld/cmake/modules/AddLLD.cmake
|
|
@@ -54,7 +54,7 @@ macro(add_lld_tool name)
|
|
|
|
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 5cff736ff57f..32f43bc1c9be 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 4ed5c647c5d2..cb31901dddbb 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()
|