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

Remove x86 specific macro definitions in MSVC build in CMake #62602

Merged
merged 1 commit into from
Dec 6, 2022

Conversation

BrettDong
Copy link
Member

Summary

None

Purpose of change

An x86-specific macro (either _X86_ or _AMD64_) is defined in CMake if building with MSVC, regardless if target architecture is x86. This is causing problems when building for ARM64: #62594 (comment)

Describe the solution

Remove the x86-specific macro definition in CMake.

Describe alternatives you've considered

Testing

Haven't tried cross-compiling to ARM64, but at least the project can still be successfully built on 64-bit x86 Windows.

Additional context

It was added in #13896 to fix some problem back then, but for now I don't see why it's necessary in CMake for MSVC.

@github-actions github-actions bot added Code: Build Issues regarding different builds and build environments json-styled JSON lint passed, label assigned by github actions astyled astyled PR, label is assigned by github actions labels Dec 6, 2022
@ZhilkinSerg ZhilkinSerg merged commit 8cdeb14 into master Dec 6, 2022
@github-actions github-actions bot added the BasicBuildPassed This PR builds correctly, label assigned by github actions label Dec 6, 2022
@BrettDong BrettDong deleted the msvc-macro branch December 6, 2022 23:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
astyled astyled PR, label is assigned by github actions BasicBuildPassed This PR builds correctly, label assigned by github actions Code: Build Issues regarding different builds and build environments json-styled JSON lint passed, label assigned by github actions
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants