|
1 |
| -diff --git a/cmake/modules/CMakeLists.txt b/cmake/modules/CMakeLists.txt |
2 |
| -index 8046ea79966..cd4fa6e673b 100644 |
3 |
| ---- a/cmake/modules/CMakeLists.txt |
4 |
| -+++ b/cmake/modules/CMakeLists.txt |
5 |
| -@@ -17,3 +17,54 @@ configure_file( |
6 |
| - SwiftConfig.cmake.in |
7 |
| - ${swift_cmake_builddir}/SwiftConfig.cmake |
8 |
| - @ONLY) |
9 |
| -+ |
10 |
| -+# Generate install-tree CMake files |
11 |
| -+set(SWIFT_CONFIG_CODE " |
12 |
| -+# Compute the installation prefix from this SwiftConfig.cmake file location. |
13 |
| -+get_filename_component(SWIFT_INSTALL_PREFIX \"\${CMAKE_CURRENT_LIST_FILE}\" PATH)") |
14 |
| -+# Construct the proper number of get_filename_component(... PATH) |
15 |
| -+# calls to compute the installation prefix. |
16 |
| -+string(REGEX REPLACE "/" ";" _count "${SWIFT_INSTALL_PACKAGE_DIR}") |
17 |
| -+foreach(p ${_count}) |
18 |
| -+ set(SWIFT_CONFIG_CODE "${SWIFT_CONFIG_CODE} |
19 |
| -+get_filename_component(SWIFT_INSTALL_PREFIX \"\${SWIFT_INSTALL_PREFIX}\" PATH)") |
20 |
| -+endforeach(p) |
21 |
| -+set(SWIFT_INCLUDE_DIRS "\${SWIFT_INSTALL_PREFIX}/include") |
22 |
| -+set(SWIFT_LIBRARY_DIRS "\${SWIFT_INSTALL_PREFIX}/lib") |
23 |
| -+set(SWIFT_CMAKE_DIR "\${SWIFT_INSTALL_PREFIX}/${SWIFT_INSTALL_PACKAGE_DIR}") |
24 |
| -+set(SWIFT_BINARY_DIR "\${SWIFT_INSTALL_PREFIX}") |
25 |
| -+ |
26 |
| -+set(SWIFT_EXPORTS_FILE "\${SWIFT_CMAKE_DIR}/SwiftExports.cmake") |
27 |
| -+set(SWIFT_CONFIG_EXPORTS ${SWIFT_EXPORTS}) |
28 |
| -+ |
29 |
| -+install(TARGETS ${SWIFT_CONFIG_EXPORTS} |
30 |
| -+ DESTINATION . |
31 |
| -+ EXPORT SwiftExports |
32 |
| -+ COMPONENT dev) |
33 |
| -+ |
34 |
| -+include(CMakePackageConfigHelpers) |
35 |
| -+configure_package_config_file(${CMAKE_CURRENT_SOURCE_DIR}/SwiftConfig.cmake.in |
36 |
| -+ "${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/SwiftConfig.cmake" |
37 |
| -+ INSTALL_DESTINATION ${SWIFT_INSTALL_PACKAGE_DIR}/cmake/swift) |
38 |
| -+ |
39 |
| -+install(FILES |
40 |
| -+ ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/SwiftConfig.cmake |
41 |
| -+ DESTINATION ${SWIFT_INSTALL_PACKAGE_DIR}) |
42 |
| -+ |
43 |
| -+install(EXPORT SwiftExports DESTINATION ${SWIFT_INSTALL_PACKAGE_DIR}) |
44 |
| -+ |
45 |
| -+# installing each header individually to preserve the directory structure |
46 |
| -+macro(install_headers directory ext) |
47 |
| -+ file(GLOB_RECURSE headers RELATIVE ${directory} ${directory}/*.${ext}) |
48 |
| -+ foreach(header ${headers}) |
49 |
| -+ get_filename_component(dir ${header} DIRECTORY) |
50 |
| -+ install(FILES ${directory}/${header} DESTINATION ${SWIFT_INCLUDE_DIRS}/${dir}) |
51 |
| -+ endforeach() |
52 |
| -+endmacro() |
53 |
| -+install_headers(${SWIFT_INCLUDE_DIR} h) |
54 |
| -+install_headers(${SWIFT_MAIN_INCLUDE_DIR} h) |
55 |
| -+install_headers(${SWIFT_INCLUDE_DIR} def) |
56 |
| -+install_headers(${SWIFT_MAIN_INCLUDE_DIR} def) |
57 |
| -+ |
58 |
| -+install(DIRECTORY ${CMAKE_SOURCE_DIR}/stdlib/public/SwiftShims DESTINATION stdlib/public) |
59 |
| -+ |
60 |
| -diff --git a/cmake/modules/SwiftComponents.cmake b/cmake/modules/SwiftComponents.cmake |
61 |
| -index 4d77e374deb..88b6645a811 100644 |
62 |
| ---- a/cmake/modules/SwiftComponents.cmake |
63 |
| -+++ b/cmake/modules/SwiftComponents.cmake |
64 |
| -@@ -76,7 +76,7 @@ set(_SWIFT_DEFINED_COMPONENTS |
65 |
| - # for the following exceptions. |
66 |
| - set(_SWIFT_DEFAULT_COMPONENTS "${_SWIFT_DEFINED_COMPONENTS}") |
67 |
| - # 'dev' takes up a lot of disk space and isn't part of a normal toolchain. |
68 |
| --list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "dev") |
69 |
| -+#list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "dev") |
70 |
| - # These clang header options conflict with 'clang-builtin-headers'. |
71 |
| - list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-resource-dir-symlink") |
72 |
| - list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resource-dir") |
73 | 1 | diff --git a/include/swift/AST/Stmt.h b/include/swift/AST/Stmt.h
|
74 | 2 | index 532e038c386..f013eee2f98 100644
|
75 | 3 | --- a/include/swift/AST/Stmt.h
|
|
0 commit comments