Update CMakeLists.txt for more portability #1005
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
add alias hiredis::hiredis and hiredis::hiredis_static so when this project is FetchContent, it behave the same as find_package-ed.
e.g.
```
find_package(hiredis 1.0.2 QUIET)
if (NOT hiredis_FOUND)
FetchContent_Declare(
hiredis
GIT_REPOSITORY https://github.com/redis/hiredis.git
GIT_TAG v1.0.2
)
FetchContent_MakeAvailable(hiredis)
endif ()
# later
target_link_libraries(target **hiredis::hiredis**) #can always use hiredis::hiredis to ref to this project. no matter find_package or FetchContent
```
this is actually sort of best practice when making a CMake lib.
bjosv
added a commit
to Nordix/hiredis-cluster
that referenced
this pull request
Apr 6, 2022
Add the missing hiredis targets if needed. This was corrected in hiredis via: redis/hiredis#1005 Revert changes for using newer hiredis in build and examples.
bjosv
added a commit
to Nordix/hiredis-cluster
that referenced
this pull request
Apr 6, 2022
* Move SSL to a separate src and headerfile This enables us to put the SSL code in a separate library, like its done in hiredis. A user will be able to link to the new library when SSL is wanted, and there is no longer the need of having `SSL_SUPPORT` defined. * Use later version than v1.0.2 of the dependency hiredis The tagged versions of hiredis does not include a required packaging correction. This correction is needed to be able to import hiredis CMake package. * Create separate ssl library via CMake A new target and package is created in CMake to build the library `hiredis_cluster_ssl` * Create separate ssl library via Make * Update CMake configs for tests Use the new `hiredis_library_ssl` when linking the test binaries, but only when building with SSL/TLS enabled. Since CMake supports transitive dependencies the `hiredis_cluster` library will make sure `hiredis` is include when linking, thus removing the explicit linkage in CMake. * Update examples to use the redis_cluster_ssl library Includes some cleanups and the use of CMAKE_PREFIX_PATH to remove some CMake configs. * Update README regarding the new SSL library * Support current hiredis releases in CMake Add the missing hiredis targets if needed. This was corrected in hiredis via: redis/hiredis#1005
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.
add alias hiredis::hiredis and hiredis::hiredis_static so when this project is FetchContent-ed, it behaves the same as find_package-ed.
e.g.
there isnt any side effect to the installed package since ALIAS is not exported.
this is actually some sort of best practice when making a CMake lib.