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 CMake files for build system 3.0 update #1102

Merged
merged 1 commit into from Mar 26, 2023

Conversation

PatTheMav
Copy link
Member

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:

  • 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-websocket 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.

CMakeLists.txt Outdated Show resolved Hide resolved
cmake/legacy.cmake Outdated Show resolved Hide resolved
cmake/macos/Info.plist.in Outdated Show resolved Hide resolved
cmake/legacy.cmake Outdated Show resolved Hide resolved
@PatTheMav PatTheMav force-pushed the macos-cmake-update branch 2 times, most recently from 1cefba0 to 1c5450b Compare February 21, 2023 21:35
.cmake-format.json Outdated Show resolved Hide resolved
cmake/legacy.cmake Outdated Show resolved Hide resolved
cmake/macos/Info.plist.in Outdated Show resolved Hide resolved
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.

Please do not merge. I will handle merge order for this and the related PRs.

@PatTheMav PatTheMav force-pushed the macos-cmake-update branch 3 times, most recently from ed08f25 to 18f3198 Compare March 24, 2023 16:11
New code path only taken if OBS_CMAKE_VERSION is set to 3.0.0 or
greater, old functionality remains unchanged.
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 merging.

@RytoEX RytoEX merged commit dd248fa into obsproject:master Mar 26, 2023
1 check passed
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