Skip to content
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

hunter_setup_msvc: tolower to fix arm64 vs ARM64 confusion #681

Merged
merged 2 commits into from
Jun 28, 2023

Conversation

NeroBurner
Copy link

@NeroBurner NeroBurner commented Jun 13, 2023

HUNTER_MSVC_ARCH should match the capitalization of the vcvarsall.bat <arch> argument. The arch argument according to vcvarsall.bat /help can be one of the following:

[arch]: x86 | amd64 | x86_amd64 | x86_arm | x86_arm64 | amd64_x86 | amd64_arm | amd64_arm64

But to be more like vcvarsall.at and cmake -A, be case-insensitive with the input architectures.

And for less confusion, always output the HUNTER_ARCH variables in lower case.

In the process cleanup, fix and extend the corresponding unittest.

Fixes: #679

`HUNTER_MSVC_ARCH` should match the capitalization of the `vcvarsall.bat
<arch>` argument. The arch argument according to `vcvarsall.bat /help`
can be one of the following:

```
[arch]: x86 | amd64 | x86_amd64 | x86_arm | x86_arm64 | amd64_x86 | amd64_arm | amd64_arm64
```

But to be more like `vcvarsall.at` and `cmake -A`, be case-insensitive
with the input architectures.

And for less confusion, always output the `HUNTER_ARCH` variables in
lower case.

In the process cleanup, fix and extend the corresponding unittest.

Fixes: #679
@NeroBurner NeroBurner added the bug Something isn't working label Jun 13, 2023
Add a special toolchain `hunter_tests` whith a simple build script
`build_hunter_tests.sh` to run the Hunter Unittests on an ubuntu runner.

All the unittests are run if one of the following folder has a
modification:
 - `cmake/modules/*`
 - `cmake/schemes/*`
 - `cmake/templates/*`
 - `tests/**/*`

Fixes: #680
@NeroBurner NeroBurner force-pushed the hunter_setup_msvc_ARM64_fix branch from cabdb25 to 5f7db13 Compare June 13, 2023 12:15
@NeroBurner
Copy link
Author

Added a fix for #680 as well. After much trying the unittests do run again if they (or hunter modules) were modified. All testing commits cleaned up again. Ready to merge

@rbsheth please review/merge

@rbsheth rbsheth merged commit 2030b5a into master Jun 28, 2023
@rbsheth rbsheth deleted the hunter_setup_msvc_ARM64_fix branch June 28, 2023 19:42
@NeroBurner
Copy link
Author

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
bug Something isn't working
Projects
None yet
Development

Successfully merging this pull request may close these issues.

unittest hunter_setup_msvc fails because of ARM64 change
2 participants