fix CMAKE_SYSTEM_NAME for Android and QNX #372
Merged
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.
#165 added support for Android, and correctly combined a lot of settings with the QNX platform. However, it also started passing
CMAKE_SYSTEM_NAME=ANDROID_OR_QNX
to CMake, which is not a supported value. Instead passAndroid
orQNX
depending on the current platform (see docs here).I had to re-organize a few config settings and some groups of flags passed together, but functionally the
CMAKE_SYSTEM_NAME
is the only value that's now passed different for theAndroid
andQNX
platform.