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

deps.windows: Update dependencies for CMake 3.0 upgrade #174

Merged
merged 5 commits into from
Jun 21, 2023
Merged

deps.windows: Update dependencies for CMake 3.0 upgrade #174

merged 5 commits into from
Jun 21, 2023

Conversation

PatTheMav
Copy link
Member

Description

  • Disables x86 builds for all dependencies not required by x86-only modules.
  • Moves luajit and Swig files into their canonical locations expected by default CMake find rules.
  • Uses VSSetup PowerShell module to find Visual Studio installations in a more portable manner (also supports ARM64 Windows hosts)
  • Creates obs-deps VERSION file in Windows packages

Motivation and Context

  • Enables compatibility with CMake 3.0 upgrade for Windows
  • Removes complexity for CMake finders in said upgrade (canonical paths are used)
  • Enables use of a single x64 project for Windows

How Has This Been Tested?

Tested builds on Windows 11

Types of changes

  • Bug fix (non-breaking change which fixes an issue)
  • 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.

@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from 59711c7 to 696c18d Compare April 1, 2023 14:27
@PatTheMav PatTheMav mentioned this pull request Apr 2, 2023
Merged
6 tasks
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch 2 times, most recently from 08b828d to 968b397 Compare April 13, 2023 17:58
@tytan652 tytan652 mentioned this pull request Apr 21, 2023
Merged
6 tasks
@RytoEX RytoEX self-assigned this May 14, 2023
RytoEX
RytoEX requested changes May 19, 2023
View reviewed changes
utils.pwsh/Setup-Target.ps1 Outdated Show resolved Hide resolved
utils.pwsh/Setup-Target.ps1 Outdated Show resolved Hide resolved
utils.pwsh/Setup-Target.ps1 Outdated Show resolved Hide resolved
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch 2 times, most recently from c998382 to a8ee9b5 Compare May 25, 2023 00:40
RytoEX
RytoEX reviewed May 25, 2023
View reviewed changes
deps.windows/50-swig.ps1 Outdated Show resolved Hide resolved
RytoEX
RytoEX approved these changes May 30, 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.

Seems generally okay to me at a glance. Will test locally once my dev environment is working again. May merge a couple of other PRs first, but will try to keep it minimal.

@RytoEX RytoEX mentioned this pull request May 30, 2023
Merged
6 tasks
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from a8ee9b5 to f081362 Compare May 30, 2023 19:49
RytoEX
RytoEX requested changes May 30, 2023
View reviewed changes
utils.pwsh/Setup-Target.ps1 Outdated Show resolved Hide resolved
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from f081362 to c029937 Compare May 31, 2023 18:18
@PatTheMav PatTheMav mentioned this pull request Jun 1, 2023
Merged
6 tasks
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch 10 times, most recently from fdb65d3 to d12521e Compare June 4, 2023 21:45
This was referenced Jun 5, 2023
Merged
Merged
@PatTheMav
Copy link
Member Author

Updated this and the other PRs to follow a single dependency trail:

  1. deps.qt: Remove Qt5 and update Qt6 build scripts #188
  2. deps.windows: Update dependencies for CMake 3.0 upgrade #174
  3. Add creation of macOS dSYM debug symbols to symbolicate release builds #183
  4. deps.ffmpeg: Switch Windows builds to native build toolchain #186

Following this order will update each part of obs-deps one by one, such as that almost all parts of it are updated in some way at the end of the process.

@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from d12521e to 147b68b Compare June 10, 2023 08:43
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from 147b68b to c012416 Compare June 14, 2023 13:27
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch 8 times, most recently from 3074ba4 to 33f7dac Compare June 17, 2023 13:11
RytoEX
RytoEX requested changes Jun 20, 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.

A quick visual look over the files before I dig back into testing.

deps.windows/60-python.ps1 Show resolved Hide resolved
utils.pwsh/Setup-Target.ps1 Show resolved Hide resolved
utils.pwsh/Setup-Target.ps1 Outdated Show resolved Hide resolved
deps.windows/60-python.ps1 Show resolved Hide resolved
Build-Dependencies.ps1 Show resolved Hide resolved
.github/workflows/main.yaml Show resolved Hide resolved
PatTheMav added 5 commits June 21, 2023 20:55
@PatTheMav
deps.windows: Update Windows dependency scripts
16f83f9 
* Adds typing to CMake variables
* Fixes LuaJIT placing import library in wrong directory
* Fixes Swig placing its binary and support files in wrong directory
* Switches PowerShell variable scopes to lowercase
@PatTheMav
deps.ffmpeg: Exclude static libz libraries from being packaged
8c498fa 
This confuses CMake's ZLIB finder, making it prefer the mingw variants
of ZLIB over the generated windows variant.
@PatTheMav
deps.windows: Update Windows build script
d9b1e2f 
* Fixes erroneous `continue` call to skip anonymous script blocks
* Add version file to generated obs-deps output package
@PatTheMav
utils.pwsh: Update Visual Studio detection to use VSSetup module
ad2c7f9
@PatTheMav
CI: Update Windows dependency build action and workflow job
d92393d
@PatTheMav PatTheMav force-pushed the windows-3.0-update branch from 33f7dac to d92393d Compare June 21, 2023 18:57
RytoEX
RytoEX approved these changes Jun 21, 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.

Tested against obs-studio git and the OBS Studio Windows CMake 3 PR. Successfully built and ran OBS in both cases with my test scene collection, so this should be good to go.

@RytoEX RytoEX merged commit 3e4f885 into obsproject:master Jun 21, 2023
@PatTheMav PatTheMav deleted the windows-3.0-update branch June 21, 2023 22:31
@RytoEX RytoEX mentioned this pull request Jul 25, 2024
Merged
6 tasks
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

@RytoEX RytoEX

Labels
Seeking Testers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@PatTheMav @RytoEX