Various tidy-ups (2) #581
Merged
Various tidy-ups (2) #581
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
jcar87
approved these changes
Nov 9, 2023
jcar87
reviewed
Nov 9, 2023
conan_provider.cmake
Outdated
| @@ -130,7 +132,7 @@ endmacro() | |||
|
|
|||
|
|
|||
| function(detect_lib_cxx OS LIB_CXX) | |||
| if(${OS} STREQUAL "Android") | |||
| if(OS STREQUAL "Android") | |||
There was a problem hiding this comment.
This one here is tricky - with the function being invoked like this:
detect_lib_cxx(MYOS MYLIB_CXX)
the value of OS inside this function is simply the string MYOS - so removing the reference (${OS}), causes this to compare the string MYOS which Android, which obviously fails.
This is the only of the detect_* functions that takes an input that is not the name of a variable to write to - so it makes it confusing.
I've refactored this to simply check in CMake for the current system name being Android, I think that's more in line with the rest of the file.
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.
This PR supercedes #561 . It has been rebased on top of
develop2, and excludes the debated variable name harmonization patch.