Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
ruanhaishen
hiredis
Commits
1b40ec50
Commit
1b40ec50
authored
Sep 04, 2020
by
Alessio M
Browse files
fixed issue with unit test linking on windows with SSL
parent
d7b1d21e
Changes
1
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
1b40ec50
...
...
@@ -50,7 +50,8 @@ SET_TARGET_PROPERTIES(hiredis
PROPERTIES WINDOWS_EXPORT_ALL_SYMBOLS TRUE
VERSION
"
${
HIREDIS_SONAME
}
"
)
IF
(
WIN32 OR MINGW
)
TARGET_LINK_LIBRARIES
(
hiredis PRIVATE ws2_32
)
TARGET_LINK_LIBRARIES
(
hiredis PUBLIC ws2_32 crypt32
)
TARGET_LINK_LIBRARIES
(
hiredis_static PUBLIC ws2_32 crypt32
)
ENDIF
()
TARGET_INCLUDE_DIRECTORIES
(
hiredis PUBLIC $<INSTALL_INTERFACE:include> $<BUILD_INTERFACE:
${
CMAKE_CURRENT_SOURCE_DIR
}
>
)
...
...
@@ -152,6 +153,7 @@ IF(ENABLE_SSL)
TARGET_LINK_LIBRARIES
(
hiredis_ssl PRIVATE
${
OPENSSL_LIBRARIES
}
)
IF
(
WIN32 OR MINGW
)
TARGET_LINK_LIBRARIES
(
hiredis_ssl PRIVATE hiredis
)
TARGET_LINK_LIBRARIES
(
hiredis_ssl_static PUBLIC hiredis_static
)
ENDIF
()
CONFIGURE_FILE
(
hiredis_ssl.pc.in hiredis_ssl.pc @ONLY
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment