CI test: Try fixing Ninja MC in the default case #42
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
jschwe
changed the title
jschwe
force-pushed
the
ninja_mc
branch
5 times, most recently
from
498050c
to
0828966
Compare
The OpenHarmony SDK contains a CMake toolchain file, which among others sets CMAKE_OHOS_ARCH_ABI. We can use this to automatically infer the correct Rust target. The SDK can be obtained from the release notes on gitee: https://gitee.com/openharmony/docs/tree/master/en/release-notes
macos-latest now maps to macos-14, which is an M1 mac. Adjust the aarch64 file to not enable CMake cross-compiling mode, and add a toolchain file for x86_64 apple.
The default output directory was the same for all `$<CONFIG>`s, which caused conflicting build rules. The issue probably still exists for the rare case when: 1. The user specified an `OUTPUT_DIRECTORY` property AND 2. did not specify an `OUTPUT_DIRECTORY_$<CONFIG>` property AND 3. The value of the `OUTPUT_DIRECTORY` does not contain a genex, depending on the `$<CONFIG>`. Corrosion could detect and append a `$<CONFIG>` in this case, but I think leaving this up to the user is reasonable for now.
Add a test with CMAKE_CROSS_CONFIGS set
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.
Probably this is not a full fix yet.