Use RTI_OPENSSL only when needed#439
Open
mikaelarguedas wants to merge 3 commits intoros2:rollingfrom
Open
Conversation
This was referenced Jun 30, 2020
f21f681 to
2890cd1
Compare
Member
|
Assuming that we can get the Windows configuration working with OpenSSL co-existence these changes look good. @mikaelarguedas is there any reason to split this PR into changes that can merge right away and changes that should wait until Windows actually works? |
Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
…over macro calls Signed-off-by: Mikael Arguedas <mikael.arguedas@gmail.com>
2890cd1 to
4d72c71
Compare
Member
Author
|
@nuclearsandwich I removed the commit reverting #433 so this PR now is just moving the existing logic around OpenSSL 1.0.2 libraries to use them only with Connext and not leak to other test configurations (that use the system one OpenSSL 1.1.1*) |
Member
Author
|
@nuclearsandwich friendly 🛎️ |
This file contains hidden or 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
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.
The addition of openssl 1.0.2 to the libs and path was done unconditionally and the changes happening in one macro were leaking to the next macro invocation. This makes all the assignments in a single place, we could also change some macros to functions to avoid local changes to CMake variables to outlive the invocation of the macro.