CMakeLists.txt: respect BUILD_SHARED_LIBS #1147
Merged
Conversation
This file contains 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
|
I like it. Looks like the right approach, and locally it works well. |
chayim
approved these changes
Dec 26, 2022
bjosv
reviewed
Dec 27, 2022
| @@ -236,10 +262,10 @@ ENDIF() | |||
| IF(NOT DISABLE_TESTS) | |||
| ENABLE_TESTING() | |||
| ADD_EXECUTABLE(hiredis-test test.c) | |||
| TARGET_LINK_LIBRARIES(hiredis-test hiredis) | |||
| TARGET_LINK_LIBRARIES(hiredis-test ${HIREDIS_DEFAULT_LIBRARY}) | |||
There was a problem hiding this comment.
I believe the same change is needed in examples/CMakeLists.txt, at least for windows.
There was a problem hiding this comment.
..and a HIREDIS_SSL_DEFAULT_LIBRARY
There was a problem hiding this comment.
Indeed, I'll update the PR
bjosv
reviewed
Dec 27, 2022
| EXPORT hiredis-targets | ||
| RUNTIME DESTINATION ${CMAKE_INSTALL_BINDIR} | ||
| LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR} | ||
| ARCHIVE DESTINATION ${CMAKE_INSTALL_LIBDIR}) | ||
|
|
||
| if (MSVC) | ||
| if (MSVC AND BUILD_SHARED_LIBS) |
There was a problem hiding this comment.
I missed two others;
- a similar change for
hiredis_sslon line 228 - a non-checked use of
hiredis_sslon line 217 (which in legacy is a bit weird, but maybe needed)
There was a problem hiding this comment.
Thanks, I updated the PR
To allow building hiredis on toolchain without dynamic library support, respect standard cmake BUILD_SHARED_LIBS: https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html Signed-off-by: Fabrice Fontaine <[email protected]>
|
Thanks everyone, merged! |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
To allow building hiredis on toolchain without dynamic library support, respect standard cmake
BUILD_SHARED_LIBS:https://cmake.org/cmake/help/latest/variable/BUILD_SHARED_LIBS.html
Signed-off-by: Fabrice Fontaine [email protected]