cmake: Update formatting and switch to native find_package call for Qt6#424
Merged
RytoEX merged 1 commit intoobsproject:masterfrom Dec 20, 2023
Merged
cmake: Update formatting and switch to native find_package call for Qt6#424RytoEX merged 1 commit intoobsproject:masterfrom
RytoEX merged 1 commit intoobsproject:masterfrom
Conversation
Member
|
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? |
a2605be to
35e2fdb
Compare
RytoEX
approved these changes
Dec 20, 2023
Member
RytoEX
left a comment
There was a problem hiding this comment.
Builds fine on Windows 11. Looks good to me.
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
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 (asobs-browserdoes) 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
Checklist: