Configure CMake build to install content into toolchain #581
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -58,6 +58,22 @@ if(SwiftTesting_BuildMacrosAsExecutables) | |
| target_compile_definitions(TestingMacros PRIVATE SWT_NO_LIBRARY_MACRO_PLUGINS) | ||
| else() | ||
| add_library(TestingMacros SHARED) | ||
|
|
||
| target_link_options(TestingMacros PRIVATE "-no-toolchain-stdlib-rpath") | ||
| # Not setting RPATH means it requires all the dependencies are already loaded | ||
| # in the process, because 'plugin' directory wouldn't contain any dependencies. | ||
| set_property(TARGET TestingMacros PROPERTY INSTALL_RPATH) | ||
|
There was a problem hiding this comment. You should use There was a problem hiding this comment. I don't know how to unset a property using There was a problem hiding this comment. Is it critical to change it? Or just an efficiency thing? There was a problem hiding this comment. Efficiency and stylistic thing I think. I believe this also work, set_target_properties(TestingMacros PROPERTIES
INSTALL_RPATH ""
BUILD_WITH_INSTALL_RPATH YES)but I just wanted to clear the property. tbh, I'm not sure which is more correct. Explicit empty list ( There was a problem hiding this comment. I believe you can do both with set_property(TARGET TestingMacros
PROPERTY INSTALL_RPATH
PROPERTY BUILD_WITH_INSTALL_RPATH YES)There was a problem hiding this comment. Hmm, are you sure? I don't think this handles multiple |
||
| set_property(TARGET TestingMacros PROPERTY BUILD_WITH_INSTALL_RPATH YES) | ||
|
|
||
| if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | ||
| set(plugin_destination_dir "lib/swift/host/plugins/testing") | ||
| else() | ||
| set(plugin_destination_dir "lib/swift/host/plugins") | ||
| endif() | ||
|
|
||
| install(TARGETS TestingMacros | ||
| LIBRARY DESTINATION "${plugin_destination_dir}" | ||
| RUNTIME DESTINATION bin) | ||
| endif() | ||
|
|
||
| target_sources(TestingMacros PRIVATE | ||
|
|
||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,80 @@ | ||
| # This source file is part of the Swift.org open source project | ||
| # | ||
| # Copyright (c) 2024 Apple Inc. and the Swift project authors | ||
| # Licensed under Apache License v2.0 with Runtime Library Exception | ||
| # | ||
| # See http://swift.org/LICENSE.txt for license information | ||
| # See http://swift.org/CONTRIBUTORS.txt for Swift project authors | ||
|
|
||
| # Returns the os name in a variable | ||
| # | ||
| # Usage: | ||
| # get_swift_host_os(result_var_name) | ||
| # | ||
| # | ||
| # Sets ${result_var_name} with the converted OS name derived from | ||
| # CMAKE_SYSTEM_NAME. | ||
| function(get_swift_host_os result_var_name) | ||
| set(${result_var_name} ${SWIFT_SYSTEM_NAME} PARENT_SCOPE) | ||
| endfunction() | ||
|
|
||
| function(_swift_testing_install_target module) | ||
| get_swift_host_os(swift_os) | ||
| get_target_property(type ${module} TYPE) | ||
|
|
||
| if(type STREQUAL STATIC_LIBRARY) | ||
| set(swift swift_static) | ||
| else() | ||
| set(swift swift) | ||
| endif() | ||
|
|
||
| target_compile_options(Testing PRIVATE "-no-toolchain-stdlib-rpath") | ||
|
|
||
| if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | ||
| set(lib_destination_dir "lib/${swift}/${swift_os}/testing") | ||
| set_property(TARGET ${module} PROPERTY | ||
| INSTALL_RPATH "@loader_path/..") | ||
| else() | ||
| set(lib_destination_dir "lib/${swift}/${swift_os}") | ||
| set_property(TARGET ${module} PROPERTY | ||
| INSTALL_RPATH "$ORIGIN") | ||
| endif() | ||
|
|
||
| install(TARGETS ${module} | ||
| ARCHIVE DESTINATION "${lib_destination_dir}" | ||
| LIBRARY DESTINATION "${lib_destination_dir}" | ||
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR}) | ||
| if(type STREQUAL EXECUTABLE) | ||
| return() | ||
| endif() | ||
|
|
||
| get_target_property(module_name ${module} Swift_MODULE_NAME) | ||
| if(NOT module_name) | ||
| set(module_name ${module}) | ||
| endif() | ||
|
|
||
| if(NOT SwiftTesting_MODULE_TRIPLE) | ||
| set(module_triple_command "${CMAKE_Swift_COMPILER}" -print-target-info) | ||
| if(CMAKE_Swift_COMPILER_TARGET) | ||
| list(APPEND module_triple_command -target ${CMAKE_Swift_COMPILER_TARGET}) | ||
| endif() | ||
| execute_process(COMMAND ${module_triple_command} OUTPUT_VARIABLE target_info_json) | ||
| string(JSON module_triple GET "${target_info_json}" "target" "moduleTriple") | ||
| set(SwiftTesting_MODULE_TRIPLE "${module_triple}" CACHE STRING "swift module triple used for installed swiftmodule and swiftinterface files") | ||
| mark_as_advanced(SwiftTesting_MODULE_TRIPLE) | ||
| endif() | ||
|
|
||
| set(module_dir "${lib_destination_dir}/${module_name}.swiftmodule") | ||
| install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftdoc | ||
| DESTINATION "${module_dir}" | ||
| RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftdoc) | ||
| install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftmodule | ||
| DESTINATION "${module_dir}" | ||
| RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftmodule) | ||
| if(CMAKE_SYSTEM_NAME STREQUAL "Darwin") | ||
| # Only Darwin has stable ABI. | ||
| install(FILES $<TARGET_PROPERTY:${module},Swift_MODULE_DIRECTORY>/${module_name}.swiftinterface | ||
| DESTINATION "${module_dir}" | ||
| RENAME ${SwiftTesting_MODULE_TRIPLE}.swiftinterface) | ||
| endif() | ||
| endfunction() |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What flags are you hoping to pull here?
This seems risky given that these flags might be for an entirely different machine than the one the macros will build for/run on.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This is actually a leftover from when I was trying around. Let me remove this as a followup.