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

cmake: Update formatting and switch to native find_package call for Qt6 #424

Merged
merged 1 commit into from
Dec 20, 2023

Conversation

PatTheMav
Copy link
Member

@PatTheMav PatTheMav commented Nov 1, 2023

Description

Updates the CMake build script for the submodule as a companion PR to obsproject/obs-studio#9769.

Motivation and Context

Clean up the code and remove unnecessary build specifics.

The main breaking change of this PR is that it correctly requires the wrapper library to be built according to the official documentation for Windows:

Linking CEF dynamically (as obs-browser does) requires the use of the dynamic MSVC runtime library and also disabling the sandbox functionality.

(Runtime library changes on Windows have been moved to a separate PR).

Current code works around this issue by forcing the runtime library to be linked statically, a workaround which is removed by this PR.

How Has This Been Tested?

Tested on Windows 11 with an updated wrapper library (built according to the documentation).

Types of changes

  • Code cleanup (non-breaking change which makes code smaller or more readable)

Checklist:

  • My code has been run through clang-format.
  • I have read the contributing document.
  • My code is not on the master branch.
  • The code has been tested.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • I have included updates to all appropriate documentation.

@RytoEX
Copy link
Member

RytoEX commented Nov 17, 2023

IIRC, this looked fine to me. The main caveat is that we would have to rebuild the Windows CEF wrapper to coincide with pulling this update into obs-studio?

Copy link
Member

@RytoEX RytoEX left a comment

Choose a reason for hiding this comment

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

Builds fine on Windows 11. Looks good to me.

@RytoEX RytoEX merged commit 1f9b458 into obsproject:master Dec 20, 2023
1 check passed
@PatTheMav PatTheMav deleted the cmake-update branch December 20, 2023 21:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants