-
-
Notifications
You must be signed in to change notification settings - Fork 1.6k
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
Fixes to CMake and version upgrade with CMake #5077
Conversation
f2f37cb
to
7e35816
Compare
baafe9b
to
7f26fa3
Compare
e6503a6
to
9aa5d49
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Gave it a spin with the Wayland API On.
- Builds with no cmake warnings
- Runs a game
Didn't notice anything immediately incorrect with the FindWayland script but I'm no cmake wizard.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Since you're adding imported targets, could you also edit pcsx2/CMakeLists.txt
to stop looking at things like WAYLAND_CLIENT_FOUND
and ${WAYLAND_CLIENT_LIBRARIES}
and just link against Wayland::Client
?
ab91d9d
to
04a1cc9
Compare
3e151c2
to
608be76
Compare
Makes policy enabling based on minimum version work properly Also increases minimum version to 3.11 because we actually do use 3.11 features
608be76
to
d9ff310
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This enables many years worth of CMake policies so we should get some testing on Linux to make sure nothing broke
Also clears warning about mismatched names getting sent to FIND_PACKAGE_HANDLE_STANDARD_ARGS
d9ff310
to
63d52da
Compare
Tested between Xorg and Wayland. Package built correctly and on basic use with loading a game seemed functional as it should be. Wayland was active as noted by the pause and resume tested resulting in the current black window glitch speed seemed fast enough for the earlier fixes to be active nearing full-speed at times. But sluggish on Nvidia compared to Xorg still. |
gt3regression.mp4Doesn't happen on master, both renderers, SW mode settings do not matter. Ok, hold on a second. Reproducing this is a pain because savestates do have an affect. |
Can you check which commit does it? I would expect it's the CMake minimum version one but just to make sure |
Nevermind, I just got unlucky when testing this PR. After many attempts you can reproduce it on master. Edit: |
As a side note. This works in the AUR environment as well |
Anything else needed to merge this? |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
runing X11 and cmake 3.16.3 , the PR complied fine and worked like master
FindWayland.cmake: Changed incorrect use of
FIND_PACKAGE_HANDLE_STANDARD_ARGS
which is meant to link and set the main package to found rather then link individual libsAdded CMake 3.22.0 as max version. Added package version in CMakeLists as per standard CMP0048
Description of Changes
Changes incorrect
FIND_PACKAGE_HANDLE_STANDARD_ARGS
to link wayland libs as imported targes. Increases the minimum Cmake version to include 3.11 and more modern 3.22 and sets "package version" as per https://cmake.org/cmake/help/latest/policy/CMP0048.html#cmp0048Rationale behind Changes
To use more modern CMAKE features for those with 3.22 and clear warnings related to that. To fix several incorrect linkages with wayland clearing warnings like
Suggested Testing Steps
See if it builds without those warnings