Skip to content

Cleanup CMake configuration for external blocks runtime support #355

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom
Merged
hmelder merged 6 commits into from
Oct 27, 2025
Merged

Cleanup CMake configuration for external blocks runtime support #355

hmelder merged 6 commits into from
Oct 27, 2025

Conversation

@hmelder
Copy link
Member

@hmelder hmelder commented Oct 20, 2025

This pull request addresses the following issues:

  • The check_symbol_exists check fails, when Block.h is located in the CMAKE_PREFIX_PATH.
  • Internal blocks runtime is always compiled, resulting in duplicate symbol errors on Windows and WebAssembly.
  • Internal blocks runtime test is always compiled and executed.
  • External symbols from the blocks runtime are incorrectly imported on Windows

@hmelder hmelder requested a review from davidchisnall October 20, 2025 10:43
@hmelder hmelder force-pushed the cmake-fix-include-dirs branch from f557cc1 to 6a18e54 Compare October 20, 2025 10:49
This was referenced Oct 20, 2025
Open
Open
@hmelder
remove unused CMake directory
2693fd4
@hmelder
Add FindBlocksRuntime.cmake from the libdispatch project
708e17f 
This is a slightly modified version of the file found in swift-corelibs-libdispatch. Notabily, the non-existent HINTS are removed.
@hmelder
CMakeLists.txt: Use FindBlocksRuntime
760eb37 
Use cmake/FindBlocksRuntime.cmake to locate the external blocks runtime,
and do not compile the internal one.
@hmelder
Only call init_trampolines when using the internal blocks rt
2d88c0b
@hmelder
Conditionally include BlockImpTest.m
0708874
@hmelder
External symbols should be imported from the DLL
fca3146
@hmelder hmelder force-pushed the cmake-fix-include-dirs branch from 6a18e54 to fca3146 Compare October 27, 2025 10:37
@hmelder hmelder requested review from davidchisnall and removed request for davidchisnall October 27, 2025 10:52
@hmelder
Copy link
Member Author

hmelder commented Oct 27, 2025

Rebased to latest master

@hmelder hmelder merged commit a6a4f7c into master Oct 27, 2025
95 checks passed
@hmelder hmelder deleted the cmake-fix-include-dirs branch October 27, 2025 12:44
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@davidchisnall davidchisnall davidchisnall approved these changes

Assignees

No one assigned

Labels

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

3 participants

@hmelder @davidchisnall