Skip to content

Commit dbb8b5b

Browse files
hamishknighthamishknight
committed
Revert "Runtimes: refactor swift interface installation"
This reverts commit 0f2ed0e.
1 parent 7c05a73 commit dbb8b5b

File tree

9 files changed

+115
-115
lines changed

9 files changed

+115
-115
lines changed

‎Runtimes/Core/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,6 @@ include(AvailabilityMacros)
8282
include(CompilerSettings)
8383
include(DefaultSettings)
8484
include(EmitSwiftInterface)
85-
include(InstallSwiftInterface)
8685
include(PlatformInfo)
8786
include(gyb)
8887
include(ResourceEmbedding)

‎Runtimes/Core/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,43 @@ function(emit_swift_interface target)
3131
endif()
3232
endif()
3333
endfunction()
34+
35+
# Install the generated swift interface file for the target if library evolution
36+
# is enabled.
37+
function(install_swift_interface target)
38+
# Install binary swift modules
39+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
40+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftmodule"
41+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
42+
COMPONENT SwiftCore_development)
43+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
44+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
45+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftmodule"
46+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
47+
COMPONENT SwiftCore_development)
48+
endif()
49+
50+
# Install Swift interfaces if library-evolution is enabled
51+
if(SwiftCore_ENABLE_LIBRARY_EVOLUTION)
52+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
53+
RENAME "${SwiftCore_MODULE_TRIPLE}.swiftinterface"
54+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
55+
COMPONENT SwiftCore_development)
56+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
57+
RENAME "${SwiftCore_MODULE_TRIPLE}.private.swiftinterface"
58+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
59+
COMPONENT SwiftCore_development)
60+
61+
# Install catalyst interface files
62+
if(SwiftCore_VARIANT_MODULE_TRIPLE)
63+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
64+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.swiftinterface"
65+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
66+
COMPONENT SwiftCore_development)
67+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftCore_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
68+
RENAME "${SwiftCore_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
69+
DESTINATION "${SwiftCore_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
70+
COMPONENT SwiftCore_development)
71+
endif()
72+
endif()
73+
endfunction()

‎Runtimes/Core/cmake/modules/InstallSwiftInterface.cmake

Lines changed: 0 additions & 39 deletions
This file was deleted.

‎Runtimes/Overlay/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,6 @@ include(gyb)
4040
include(AvailabilityMacros)
4141
include(DefaultSettings)
4242
include(EmitSwiftInterface)
43-
include(InstallSwiftInterface)
4443
include(PlatformInfo)
4544
include(ResourceEmbedding)
4645

‎Runtimes/Overlay/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,38 @@ function(emit_swift_interface target)
3131
endif()
3232
endif()
3333
endfunction()
34+
35+
# Install the generated swift interface file for the target if library evolution
36+
# is enabled.
37+
function(install_swift_interface target)
38+
# Install binary swift modules
39+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
40+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftmodule"
41+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
42+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
43+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
44+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftmodule"
45+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
46+
endif()
47+
48+
# Install Swift interfaces if library-evolution is enabled
49+
if(SwiftOverlay_ENABLE_LIBRARY_EVOLUTION)
50+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
51+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.swiftinterface"
52+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
53+
54+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
55+
RENAME "${SwiftOverlay_MODULE_TRIPLE}.private.swiftinterface"
56+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
57+
58+
# Install catalyst interface files
59+
if(SwiftOverlay_VARIANT_MODULE_TRIPLE)
60+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
61+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.swiftinterface"
62+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
63+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${SwiftOverlay_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
64+
RENAME "${SwiftOverlay_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
65+
DESTINATION "${SwiftOverlay_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule")
66+
endif()
67+
endif()
68+
endfunction()

‎Runtimes/Overlay/cmake/modules/InstallSwiftInterface.cmake

Lines changed: 0 additions & 34 deletions
This file was deleted.

‎Runtimes/Supplemental/StringProcessing/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@ include(GNUInstallDirs)
3030

3131
include(AvailabilityMacros)
3232
include(EmitSwiftInterface)
33-
include(InstallSwiftInterface)
3433
include(PlatformInfo)
3534
include(ResourceEmbedding)
3635

‎Runtimes/Supplemental/cmake/modules/EmitSwiftInterface.cmake

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,3 +31,43 @@ function(emit_swift_interface target)
3131
endif()
3232
endif()
3333
endfunction()
34+
35+
# Install the generated swift interface file for the target if library evolution
36+
# is enabled.
37+
function(install_swift_interface target)
38+
# Install binary swift modules
39+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
40+
RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.swiftmodule"
41+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
42+
COMPONENT ${PROJECT_NAME}_development)
43+
if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
44+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.swiftmodule"
45+
RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftmodule"
46+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
47+
COMPONENT ${PROJECT_NAME}_development)
48+
endif()
49+
50+
# Install Swift interfaces if library-evolution is enabled
51+
if(${PROJECT_NAME}_ENABLE_LIBRARY_EVOLUTION)
52+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftinterface"
53+
RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.swiftinterface"
54+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
55+
COMPONENT ${PROJECT_NAME}_development)
56+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.private.swiftinterface"
57+
RENAME "${${PROJECT_NAME}_MODULE_TRIPLE}.private.swiftinterface"
58+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
59+
COMPONENT ${PROJECT_NAME}_development)
60+
61+
# Install catalyst interface files
62+
if(${PROJECT_NAME}_VARIANT_MODULE_TRIPLE)
63+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.swiftinterface"
64+
RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.swiftinterface"
65+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
66+
COMPONENT ${PROJECT_NAME}_development)
67+
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${target}-${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}/${target}.private.swiftinterface"
68+
RENAME "${${PROJECT_NAME}_VARIANT_MODULE_TRIPLE}.private.swiftinterface"
69+
DESTINATION "${${PROJECT_NAME}_INSTALL_SWIFTMODULEDIR}/$<TARGET_PROPERTY:${target},Swift_MODULE_NAME>.swiftmodule"
70+
COMPONENT ${PROJECT_NAME}_development)
71+
endif()
72+
endif()
73+
endfunction()

‎Runtimes/Supplemental/cmake/modules/InstallSwiftInterface.cmake

Lines changed: 0 additions & 39 deletions
This file was deleted.

0 commit comments

Comments
 (0)