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

Update Qt5_DIR path for ARM64 in CMake project #8567

Merged
merged 1 commit into from
Jan 19, 2020

Conversation

tinyredpanda
Copy link
Contributor

While I was trying to compile the CMake project in VS2019, I spotted a mistake where if ARM64 configuration was chosen, the Intel path would be used instead of ARM64. I realise the section if(NOT Qt5DIR AND MSVC) may not be needed, it certainly wasn't evaulated true (because Qt5DIR was already defined by this point) when I ran CMake generation.

Copy link
Contributor

@stenzek stenzek left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Whoops, I probably should've tested this before merging. Thanks for catching it.

@stenzek stenzek merged commit c74b114 into dolphin-emu:master Jan 19, 2020
@tinyredpanda tinyredpanda deleted the fix-arm64-qt-path branch January 19, 2020 16:25
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
2 participants