Skip to content

Commit 0f3f3e5

Browse files
committed
NFC: Cleanup full module directory
Adding the additional driver outputs in the cleanup files. This cleans up the warnings from `ninja clean`. ``` Cleaning... ninja: error: remove(clang/_Builtin_float.swiftmodule): Directory not empty ```
1 parent beac5fa commit 0f3f3e5

File tree

2 files changed

+28
-0
lines changed

2 files changed

+28
-0
lines changed

Runtimes/Core/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,17 @@ function(emit_swift_interface target)
2727
endif()
2828
target_compile_options(${target} PRIVATE
2929
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-module-path ${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftmodule>")
30+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
31+
"${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftmodule"
32+
"${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftdoc"
33+
"${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftsourceinfo")
3034
if(SwiftCore_VARIANT_MODULE_TRIPLE)
3135
target_compile_options(${target} PRIVATE
3236
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule>")
37+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
38+
"${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule"
39+
"${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftdoc"
40+
"${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftsourceinfo")
3341
endif()
3442
add_custom_command(OUTPUT "${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftmodule"
3543
DEPENDS ${target})
@@ -42,10 +50,16 @@ function(emit_swift_interface target)
4250
target_compile_options(${target} PRIVATE
4351
$<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftinterface>
4452
$<$<COMPILE_LANGUAGE:Swift>:-emit-private-module-interface-path$<SEMICOLON>${module_directory}/${SwiftCore_MODULE_TRIPLE}.private.swiftinterface>)
53+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
54+
"${module_directory}/${SwiftCore_MODULE_TRIPLE}.swiftinterface"
55+
"${module_directory}/${SwiftCore_MODULE_TRIPLE}.private.swiftinterface")
4556
if(SwiftCore_VARIANT_MODULE_TRIPLE)
4657
target_compile_options(${target} PRIVATE
4758
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-interface-path ${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface>"
4859
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-private-module-interface-path ${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface>")
60+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
61+
"${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface"
62+
"${module_directory}/${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface")
4963
endif()
5064
target_compile_options(${target} PRIVATE
5165
$<$<COMPILE_LANGUAGE:Swift>:-library-level$<SEMICOLON>api>

Runtimes/Overlay/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,17 @@ function(emit_swift_interface target)
2727
endif()
2828
target_compile_options(${target} PRIVATE
2929
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-module-path ${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftmodule>")
30+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
31+
"${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
32+
"${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftdoc"
33+
"${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftsourceinfo")
3034
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
3135
target_compile_options(${target} PRIVATE
3236
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-path ${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule>")
37+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
38+
"${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule"
39+
"${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftdoc"
40+
"${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftsourceinfo")
3341
endif()
3442
add_custom_command(OUTPUT "${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
3543
DEPENDS ${target})
@@ -42,10 +50,16 @@ function(emit_swift_interface target)
4250
target_compile_options(${target} PRIVATE
4351
$<$<COMPILE_LANGUAGE:Swift>:-emit-module-interface-path$<SEMICOLON>${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftinterface>
4452
$<$<COMPILE_LANGUAGE:Swift>:-emit-private-module-interface-path$<SEMICOLON>${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface>)
53+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
54+
"${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.swiftinterface"
55+
"${module_directory}/${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface")
4556
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
4657
target_compile_options(${target} PRIVATE
4758
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-module-interface-path ${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface>"
4859
"$<$<COMPILE_LANGUAGE:Swift>:SHELL:-emit-variant-private-module-interface-path ${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface>")
60+
set_property(TARGET "${target}" APPEND PROPERTY ADDITIONAL_CLEAN_FILES
61+
"${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface"
62+
"${module_directory}/${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface")
4963
endif()
5064
target_compile_options(${target} PRIVATE
5165
$<$<COMPILE_LANGUAGE:Swift>:-library-level$<SEMICOLON>api>

0 commit comments

Comments
 (0)