Skip to content

Commit 20995ae

Browse files
committed
[build] Add FILES_MATCHING to CMakeLists.txt
The bare "PATTERN" argument by default does nothing, you need either "EXCLUDE" or "FILES_MATCHING" to make it do something. This likely wasn't previously a problem because clang is only installing headers, but it should be fixed for robustness.
1 parent 161899d commit 20995ae

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

localization/CMakeLists.txt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@ swift_install_in_component(
2020
DIRECTORY ${CMAKE_BINARY_DIR}/share/swift/diagnostics/
2121
DESTINATION "share/swift/diagnostics"
2222
COMPONENT compiler
23+
FILES_MATCHING
2324
PATTERN "*.db"
2425
PATTERN "*.yaml"
2526
)

stdlib/public/SwiftShims/CMakeLists.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -197,13 +197,13 @@ endif()
197197
swift_install_in_component(DIRECTORY "${clang_headers_location}/"
198198
DESTINATION "lib/swift/clang"
199199
COMPONENT clang-builtin-headers
200-
PATTERN "*.h")
200+
FILES_MATCHING PATTERN "*.h")
201201

202202
if(SWIFT_BUILD_STATIC_STDLIB)
203203
swift_install_in_component(DIRECTORY "${clang_headers_location}/"
204204
DESTINATION "lib/swift_static/clang"
205205
COMPONENT clang-builtin-headers
206-
PATTERN "*.h")
206+
FILES_MATCHING PATTERN "*.h")
207207
endif()
208208

209209

@@ -227,4 +227,4 @@ file(TO_CMAKE_PATH "${LLVM_LIBRARY_OUTPUT_INTDIR}"
227227
swift_install_in_component(DIRECTORY "${_SWIFT_SHIMS_PATH_TO_CLANG_BUILD}/lib/clang"
228228
DESTINATION "lib"
229229
COMPONENT clang-builtin-headers-in-clang-resource-dir
230-
PATTERN "*.h")
230+
FILES_MATCHING PATTERN "*.h")

0 commit comments

Comments
 (0)