-
Notifications
You must be signed in to change notification settings - Fork 1.8k
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.
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
Added package configs and fixed hiredis_ssl on Windows #770
Conversation
2aa58fc
to
1360b0d
Compare
This should hopefully not be a controversial change. Nevertheless, is it preferred that I actually split this into 2 PRs since it combines 2 unrelated changes? |
1360b0d
to
0a551ff
Compare
@michael-grunder Does this seem reasonable? Should I create an issue to correspond with this change? |
Hi @heronr, not a CMake expert but it looks perfectly reasonable to me. Same for the SSL locking changes, thanks! |
@heronr Looking at another CMake related issue now and I noticed this:
Doesn't this make the explicit def files redundant, or the other way around - if explicit export is used perhaps we can avoid |
I added the My motivation was getting our unit tests working in Windows, including the various different ways one might do that (e.g. build with MSVC, MinGW, or Cygwin) as they needed slightly different exports. I'm happy to fix the conflicts so we can get this merged. |
@michael-grunder Oh okay, haven't really looked around but bumped into this while pushing #780. Thanks! |
Hi @heronr I fixed the merge conflicts on your PR in this branch on my fork The only substantive change I made was using to If the changes look good to you I'm happy to merge it into master or if you prefer you could merge my modifications into your PR branch and I'll merge this PR. Thanks for your contribution! Cheers, |
@michael-grunder , the changes you made look good to me. You can go ahead and merge those changes in. Thank you! |
Closing in favor of #783 Edit: These changes have now been merged, thanks again! |
This change mainly accomplishes 2 things:
A CMake build now generates package config files for both hiredis and hiredis_ssl. This enables other CMake projects to use find_package() calls to more easily incorporate hiredis into their project.
hiredis_ssl now builds on Windows using the CMake project
I was able to successfully build on both Windows and Linux using these changes.