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 CMake files for build system 3.0 update #1102
Merged
Conversation
This file contains 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
Merged
6 tasks
RytoEX
requested changes
Feb 15, 2023
PatTheMav
force-pushed
the
macos-cmake-update
branch
2 times, most recently
from
February 21, 2023 21:35
1cefba0
to
1c5450b
Compare
RytoEX
requested changes
Mar 1, 2023
PatTheMav
force-pushed
the
macos-cmake-update
branch
from
March 4, 2023 20:59
1c5450b
to
8618ca3
Compare
RytoEX
approved these changes
Mar 21, 2023
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 good to me.
Please do not merge. I will handle merge order for this and the related PRs.
PatTheMav
force-pushed
the
macos-cmake-update
branch
3 times, most recently
from
March 24, 2023 16:11
ed08f25
to
18f3198
Compare
New code path only taken if OBS_CMAKE_VERSION is set to 3.0.0 or greater, old functionality remains unchanged.
PatTheMav
force-pushed
the
macos-cmake-update
branch
from
March 24, 2023 16:30
18f3198
to
06a4619
Compare
RytoEX
approved these changes
Mar 24, 2023
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 good to me. Pat or I will handle merging.
5 tasks
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
This PR updates the CMake build files to be compatible with the build system 3.0 update on the main repository.
Motivation and Context
This PR attempts to retain the possibility to generate a build project standalone but also support new functionality introduced by the build system 3.0 update:
More information shall be available in the pull request on the main repository.
Note: This PR needs to be merged first, then the associated commit hash updated for the obs-websocket submodule at obs-studio.
How Has This Been Tested?
Types of changes
Checklist:
master
or arelease/*
branch.