Skip to content

Commit 405df02

Browse files
committed
Merge pull request #2395 from bitjammer/remote-mirror-headers
Install SwiftRemoteMirror headers into swift-remote-mirror-headers co…
2 parents 9d2dfc0 + d5bcda6 commit 405df02

File tree

4 files changed

+13
-3
lines changed

4 files changed

+13
-3
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -86,7 +86,7 @@ set(SWIFT_ENABLE_GOLD_LINKER FALSE CACHE BOOL
8686
"Enable using the gold linker when available")
8787

8888
set(_SWIFT_KNOWN_INSTALL_COMPONENTS
89-
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc")
89+
"autolink-driver;compiler;clang-builtin-headers;clang-resource-dir-symlink;clang-builtin-headers-in-clang-resource-dir;stdlib;stdlib-experimental;sdk-overlay;editor-integration;tools;testsuite-tools;dev;license;sourcekit-xpc-service;sourcekit-inproc;swift-remote-mirror-headers")
9090

9191
# Set the SWIFT_INSTALL_COMPONENTS variable to the default value if it is not passed in via -D
9292
set(SWIFT_INSTALL_COMPONENTS "${_SWIFT_KNOWN_INSTALL_COMPONENTS}" CACHE STRING

include/swift/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ configure_file(Config.h.in ${CMAKE_CURRENT_BINARY_DIR}/Config.h
22
ESCAPE_QUOTES @ONLY)
33

44
add_subdirectory(Option)
5+
add_subdirectory(SwiftRemoteMirror)
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
set(swift_remote_mirror_headers)
2+
list(APPEND swift_remote_mirror_headers
3+
"MemoryReaderInterface.h"
4+
"SwiftRemoteMirror.h"
5+
"SwiftRemoteMirrorTypes.h")
6+
swift_install_in_component("swift-remote-mirror-headers"
7+
FILES ${swift_remote_mirror_headers}
8+
DESTINATION "include/swift/SwiftRemoteMirror")
9+

utils/build-presets.ini

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
[preset: mixin_buildbot_install_components]
1717
dash-dash
1818

19-
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-xpc-service
19+
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;editor-integration;tools;testsuite-tools;sourcekit-xpc-service;swift-remote-mirror-headers;
2020

2121

2222
[preset: mixin_buildbot_trunk_base]
@@ -720,7 +720,7 @@ mixin-preset=
720720

721721
dash-dash
722722

723-
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service
723+
swift-install-components=compiler;clang-builtin-headers;stdlib;sdk-overlay;license;sourcekit-xpc-service;swift-remote-mirror-headers
724724
llvm-install-components=libclang;libclang-headers
725725

726726
# Path to the .tar.gz package we would create.

0 commit comments

Comments
 (0)