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.

Sign up for GitHub

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

Jump to bottom

cmake: Update CMake files for build system 3.0 update #434

Merged
merged 2 commits into from Mar 26, 2023
Merged

cmake: Update CMake files for build system 3.0 update #434

merged 2 commits into from Mar 26, 2023

Conversation

PatTheMav
Copy link
Member

@PatTheMav PatTheMav commented Feb 10, 2023 •
edited

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

  • The current build script is retained as the "legacy" script (which will still be used to generate build projects on Linux and macOS)
  • The new build script is used for macOS builds by default at first

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-amd-encoder submodule at obs-studio.

How Has This Been Tested?

  • New build scripts were tested as part of the overall update on macOS 13, Ubuntu 22.10, and Windows 11.

Types of changes

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

Checklist:

  • I have read the Contributing Guidelines.
  • All commit messages are properly formatted and commits squashed where appropriate.
  • My code is not on master or a release/* branch.
  • The code has been tested.
  • I have included updates to all appropriate documentation.

@PatTheMav PatTheMav mentioned this pull request Feb 10, 2023
Merged
6 tasks
@PatTheMav PatTheMav force-pushed the obs-cmake-update branch 3 times, most recently from 6b6dc4c to c3a551e Compare February 21, 2023 21:35
RytoEX
RytoEX requested changes Mar 1, 2023
View reviewed changes
.cmake-format.json Outdated Show resolved Hide resolved
RytoEX
RytoEX approved these changes Mar 22, 2023
View reviewed changes
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.

Looks good to me. Pat or I will handle the merge order of this and the related PRs.

@PatTheMav
cmake: Add updated cmake-format for upstream compatibility
24873e4 
This cmake-format configuration will supersede the current configuration
in an upcoming update on obs-studio and will be in sync then.
@PatTheMav
cmake: Update build system for CMake build framework 3.0
4c07aa2 
This also simplifies the CMake script tremendously as it assumes the
project being built as a core obs-studio plugin.

Minimum required CMake version is 3.24, specifying `OBS_CMAKE_VERSION`
as a cache variable with a version lower than 3.0.0 switches back to the
original CMake script.

NOTE: This requires CMake build framework 3.0 on obs-studio.
@RytoEX RytoEX merged commit 5d4744e into obsproject:master Mar 26, 2023
@PatTheMav PatTheMav deleted the obs-cmake-update branch March 28, 2023 14:26
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@RytoEX RytoEX RytoEX approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@PatTheMav @RytoEX