Skip to content
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

Fix hiredis_cluster_ssl build on Windows #253

Merged
merged 5 commits into from
Jan 15, 2025
Merged

Fix hiredis_cluster_ssl build on Windows #253

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a8bf8d4
Fix hiredis_cluster_ssl build on Windows
ffratila Jan 14, 2025
490d945
Revert "Fix hiredis_cluster_ssl build on Windows"
ffratila Jan 15, 2025
9657724
Export all symbols for both libraries on Windows
ffratila Jan 15, 2025
956caaa
Remove reference to deleted .def file
ffratila Jan 15, 2025
ea1244a
Enable non-const connect callback API on Windows
ffratila Jan 15, 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
8 changes: 7 additions & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,12 +50,17 @@ SET(hiredis_cluster_sources
hiarray.c
hircluster.c
hiutil.c)
SET(hiredis_cluster_ssl_sources
hircluster_ssl.c)

if(WIN32 OR MINGW)
add_compile_definitions(_CRT_SECURE_NO_WARNINGS WIN32_LEAN_AND_MEAN)
set(hiredis_cluster_sources
${hiredis_cluster_sources}
hiredis_cluster.def)
set(hiredis_cluster_ssl_sources
${hiredis_cluster_ssl_sources}
hiredis_cluster_ssl.def)
endif()

add_library(hiredis_cluster
Expand Down Expand Up @@ -165,7 +170,8 @@ if(ENABLE_SSL)
endif()

add_library(hiredis_cluster_ssl
SHARED hircluster_ssl.c)
SHARED
${hiredis_cluster_ssl_sources})
set_target_properties(hiredis_cluster_ssl
PROPERTIES VERSION "${HIREDIS_CLUSTER_SONAME}")
bjosv marked this conversation as resolved.
Show resolved Hide resolved
target_link_libraries(hiredis_cluster_ssl
Expand Down
2 changes: 2 additions & 0 deletions hiredis_cluster_ssl.def
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
EXPORTS
redisClusterSetOptionEnableSSL
Loading