Ship a .framework version of Mono #53370
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
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 |
|---|---|---|
|
|
@@ -381,6 +381,47 @@ if(NOT DISABLE_SHARED_LIBS) | |
| add_library(monosgen-shared-dac SHARED "mini-windows-dlldac.c") | ||
| set_target_properties(monosgen-shared-dac PROPERTIES OUTPUT_NAME ${MONO_SHARED_LIB_NAME}-dac) | ||
| endif() | ||
|
|
||
| if(BUILD_DARWIN_FRAMEWORKS) | ||
| if(TARGET_DARWIN) | ||
|
Member
There was a problem hiding this comment. I think this should be
Contributor
Author
There was a problem hiding this comment. So we should never build a .framework in the case of .dylib components? Didn't you say iOS Simulator should ship dylibs & build against stubs in #53370 (comment) ?
Member
There was a problem hiding this comment. Sorry, I meant to me this looks like the code only supports the static components case. I assumed a dynamic components version will be added in a follow-up PR. Maybe I misunderstood what's happening here. |
||
| # In cmake, you cannot have list entries which contain a space or semicolon - those are considered | ||
| # record separators (i.e. a list of list(APPEND foo "a" "b;c" "d e") is a five entry list of values | ||
| # a, b, c, d and e. | ||
| # So, in order to treat the components lists as single list entries, swap out the ; character | ||
| # for a temporary replacement character, allowing the full lists to be treated as single entries | ||
| string(REPLACE ";" "*" mono-components-objects-nowhitespace "${mono-components-objects}") | ||
directhex marked this conversation as resolved.
Show resolved
Hide resolved
|
||
| string(REPLACE ";" "*" mono-components-stub-objects-nowhitespace "${mono-components-stub-objects}") | ||
| list(APPEND FrameworkConfig Mono.debug Mono.release) | ||
| list(APPEND ComponentsObjects "${mono-components-objects-nowhitespace}" "${mono-components-stub-objects-nowhitespace}") | ||
| foreach(frameworkconfig componentsobjects IN ZIP_LISTS FrameworkConfig ComponentsObjects) | ||
| if("${componentsobjects}" STREQUAL "") | ||
| #components list is empty, use stubs instead | ||
| set(componentsobjects "${mono-components-stub-objects-nowhitespace}") | ||
| endif() | ||
| add_library(${frameworkconfig} SHARED $<TARGET_OBJECTS:monosgen-objects>) | ||
| target_compile_definitions(${frameworkconfig} PRIVATE -DMONO_DLL_EXPORT) | ||
| target_sources(${frameworkconfig} PRIVATE $<TARGET_OBJECTS:eglib_objects>) | ||
| target_link_libraries(${frameworkconfig} PRIVATE ${OS_LIBS} ${ICONV_LIB} ${LLVM_LIBS} ${ICU_LIBS}) | ||
| if(ICU_LDFLAGS) | ||
| set_property(TARGET ${frameworkconfig} APPEND_STRING PROPERTY LINK_FLAGS " ${ICU_LDFLAGS}") | ||
| endif() | ||
| if(STATIC_ICU) | ||
| set_property(TARGET ${frameworkconfig} APPEND_STRING PROPERTY LINKER_LANGUAGE CXX) | ||
| endif () | ||
| set_property(TARGET ${frameworkconfig} APPEND_STRING PROPERTY LINK_FLAGS " -Wl,-compatibility_version -Wl,2.0 -Wl,-current_version -Wl,2.0") | ||
| string(REPLACE "*" ";" componentsobjects-whitespace "${componentsobjects}") | ||
| target_sources(${frameworkconfig} PRIVATE "${componentsobjects-whitespace}") | ||
| set_target_properties(${frameworkconfig} PROPERTIES | ||
| FRAMEWORK TRUE | ||
| FRAMEWORK_VERSION C | ||
| MACOSX_FRAMEWORK_IDENTIFIER net.dot.mono-framework | ||
| ) | ||
| install(TARGETS ${frameworkconfig} | ||
| FRAMEWORK DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| ) | ||
| endforeach() | ||
| endif() | ||
| endif() | ||
| endif() | ||
|
|
||
| find_package(Python3 COMPONENTS Interpreter) | ||
|
|
||
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.
Uh oh!
There was an error while loading. Please reload this page.