-
-
Notifications
You must be signed in to change notification settings - Fork 7.8k
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
Add Libqrcodegencpp on Linux and add its finder #8943
Conversation
This has a merge conflict. Can this be merged independently of obsproject/obs-deps#182? |
Fixed
Yes, only the obs-websocket PR does not. |
d224f7a
to
8753601
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.
Looks okay at a glance.
@GeorgesStavracas Flatpak parts look okay?
@PatTheMav CMake finders look okay?
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.
Flatpak change is fine 👍
8753601
to
8d847b5
Compare
Did I understand it right that we need this finder despite manually adding a CMake project for the library at obs-deps? Does the separate CMake project repo add everything but proper CMake project generation? |
I quote myself from the PR description:
Edit: So blame Ubuntu and/or Debian. |
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.
Should be fine even with Windows and macOS variants shipped as CMake packages (local FindModules take precedence). Once Linux is updated to the CMake path, the finder probably needs to be moved to the Linux-specific subdirectory (just like the Windows-specific Python finder) as it will not be needed by the other platforms.
8d847b5
to
f2c49bb
Compare
It seems that #8327 introduced a minor merge conflict. |
f2c49bb
to
5db7d93
Compare
Conflict fixed. |
Description
Related to:
obs-websockets PR requires:
Dependency of:
Add Libqrcodegencpp to Ubuntu script and Flatpak and its finder since not all distribution of the library comes with a CMake package.
Please, review the finder on the cmake-finders repo PR.
Motivation and Context
Reduce to zero the number of submodule in obs-websocket repo.
How Has This Been Tested?
Generated a QR code with obs-websocket with obs-websocket build with the library and not the submodule on Linux.
Test binaries available on a PR on my fork: tytan652#13
Types of changes
Checklist: