averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-14 20:36:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[CMake] Give a dedicated component to compiler swift-syntax libraries (#76497)

Browse Source 
* [CMake] Give a dedicated component to compiler swift-syntax libraries

'compiler-swift-syntax-lib' so projects statically link to compiler
libraries (libAST etc) can use the required shared libraries.

rdar://135923606

* Update cmake caches

* Add back implicit `swift-syntax-lib` to `compiler` component for now

Some clients doesn't specify `swift-syntax-lib`.
This commit is contained in:
Rintaro Ishizaki
2024-09-16 21:34:32 -07:00
committed by GitHub
parent 4d920f01d3
commit e916e9e459
5 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cmake/caches/Linux-x86_64.cmake
View File

@@ -142,12 +142,14 @@ set(LLDB_TOOLS
set(SWIFT_INSTALL_COMPONENTS
autolink-driver
compiler
compiler-swift-syntax-lib
clang-builtin-headers
editor-integration
tools
sourcekit-inproc
swift-remote-mirror
swift-remote-mirror-headers
swift-syntax-lib
CACHE STRING "")
set(LLVM_DISTRIBUTION_COMPONENTS

1
cmake/caches/Windows-aarch64.cmake
View File

@@ -149,6 +149,7 @@ set(LLDB_TOOLS
set(SWIFT_INSTALL_COMPONENTS
autolink-driver
compiler
compiler-swift-syntax-lib
clang-builtin-headers
editor-integration
tools

1
cmake/caches/Windows-x86_64.cmake
View File

@@ -189,6 +189,7 @@ set(LLDB_TOOLS
set(SWIFT_INSTALL_COMPONENTS
autolink-driver
compiler
compiler-swift-syntax-lib
clang-builtin-headers
editor-integration
tools

9
cmake/modules/SwiftComponents.cmake
View File

@@ -48,6 +48,7 @@
# * autolink-driver -- the Swift driver support tools
# * back-deployment -- Swift back-deployment libraries
# * compiler -- the Swift compiler and (on supported platforms) the REPL.
# * compiler-swift-syntax-lib -- install swift-syntax libraries for the compiler.
# * clang-builtin-headers -- install a copy of Clang builtin headers under
# 'lib/swift/clang'. This is useful when Swift compiler is installed in
# isolation.
@@ -70,7 +71,7 @@
# * llvm-toolchain-dev-tools -- install LLVM development tools useful in a shared toolchain
# * dev -- headers and libraries required to use Swift compiler as a library.
set(_SWIFT_DEFINED_COMPONENTS
"autolink-driver;back-deployment;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;libexec;stdlib;stdlib-experimental;sdk-overlay;static-mirror-lib;swift-syntax-lib;editor-integration;tools;testsuite-tools;toolchain-tools;toolchain-dev-tools;llvm-toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
"autolink-driver;back-deployment;compiler;compiler-swift-syntax-lib;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;libexec;stdlib;stdlib-experimental;sdk-overlay;static-mirror-lib;swift-syntax-lib;editor-integration;tools;testsuite-tools;toolchain-tools;toolchain-dev-tools;llvm-toolchain-dev-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror;swift-remote-mirror-headers")
# The default install components include all of the defined components, except
# for the following exceptions.
@@ -97,7 +98,13 @@ macro(swift_configure_components)
set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_DEFAULT_COMPONENTS}" CACHE STRING
"A semicolon-separated list of components to install from the set ${_SWIFT_DEFINED_COMPONENTS}")
# 'compiler' depends on 'compiler-swift-syntax-lib' component.
if ("compiler" IN_LIST SWIFT_INSTALL_COMPONENTS AND
NOT "compiler-swift-syntax-lib" IN_LIST SWIFT_INSTALL_COMPONENTS)
list(APPEND SWIFT_INSTALL_COMPONENTS "compiler-swift-syntax-lib")
endif()
# 'compiler' depends on 'swift-syntax-lib' component.
# FIXME: Remove this. Clients should specify the components explicitly.
if ("compiler" IN_LIST SWIFT_INSTALL_COMPONENTS AND
NOT "swift-syntax-lib" IN_LIST SWIFT_INSTALL_COMPONENTS)
list(APPEND SWIFT_INSTALL_COMPONENTS "swift-syntax-lib")

6
lib/CompilerSwiftSyntax/CMakeLists.txt
View File

@@ -52,6 +52,6 @@ foreach(lib ${compiler_swiftsyntax_libs})
endforeach()
swift_install_in_component(TARGETS ${compiler_swiftsyntax_libs}
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler
RUNTIME DESTINATION "bin" COMPONENT compiler)
ARCHIVE DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler-swift-syntax-lib
LIBRARY DESTINATION "lib${LLVM_LIBDIR_SUFFIX}/swift/host/compiler" COMPONENT compiler-swift-syntax-lib
RUNTIME DESTINATION "bin" COMPONENT compiler-swift-syntax-lib)