Skip to content

build: adjust the build to support building statically on Windows #885

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

Merged
merged 2 commits into from
Jul 6, 2025
Merged

build: adjust the build to support building statically on Windows #885

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c12b88d
build: support static libclosure builds
compnerd May 16, 2025
053f8ad
build: support static dispatch builds
compnerd May 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dispatch/base.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@
# endif
#else
# if defined(_WIN32)
# if defined(dispatch_EXPORT) || defined(__DISPATCH_BUILDING_DISPATCH__)
# if defined(dispatch_EXPORTS)
# define DISPATCH_EXPORT DISPATCH_EXTERN __declspec(dllexport)
# else
# define DISPATCH_EXPORT DISPATCH_EXTERN __declspec(dllimport)
Expand Down
5 changes: 4 additions & 1 deletion src/BlocksRuntime/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,11 @@ if(WIN32)
BlocksRuntime.def)

if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(BlocksRuntime PRIVATE
target_compile_definitions(BlocksRuntime PUBLIC
BlocksRuntime_STATIC)
target_compile_options(BlocksRuntime PUBLIC
"$<$<COMPILE_LANGUAGE:C,CXX>:SHELL:$<$<BOOL:${MSVC}>:-Xclang >-static-libclosure>"
$<$<COMPILE_LANGUAGE:Swift>:SHELL:-Xcc -static-libclosure>)
endif()
endif()

Expand Down
4 changes: 4 additions & 0 deletions src/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,6 +92,10 @@ target_include_directories(dispatch PUBLIC
target_include_directories(dispatch PRIVATE
${PROJECT_SOURCE_DIR}/private)

if(NOT BUILD_SHARED_LIBS)
target_compile_definitions(dispatch PUBLIC
dispatch_STATIC)
endif()
if(WIN32)
target_compile_definitions(dispatch PRIVATE
_CRT_NONSTDC_NO_WARNINGS
Expand Down
2 changes: 2 additions & 0 deletions tests/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ add_library(bsdtests
STATIC
bsdtests.c
dispatch_test.c)
target_link_libraries(bsdtests PUBLIC
dispatch)
target_include_directories(bsdtests
PRIVATE
${CMAKE_CURRENT_BINARY_DIR}
Expand Down