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: Disable discovery of Homebrew libraries for dependencies #11299

Merged
merged 2 commits into from
Sep 26, 2024
Merged

cmake: Disable discovery of Homebrew libraries for dependencies #11299

merged 2 commits into from
Sep 26, 2024

Commits on Sep 23, 2024

  1. cmake: Disable discovery of Homebrew libraries for dependencies 

    macOS builds should only use dependencies built via the obs-deps
build scripts. Default variants of the same dependencies are not
compatible with our app packaging requirements and thus will create
issues when creating the app bundle.

This is specifically an issue when MbedTLS is installed via Homebrew
which ships a CMake package config by default and is picked up
by our code ever since we switched to prefer CMake packages.
    @PatTheMav
    PatTheMav committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    9d143f0 View commit details
    Browse the repository at this point in the history

  2. cmake: Change library discovery order in LuaJIT find module 

    To ensure that the find module prefers the variant of LuaJIT shipped
as part of obs-deps, it's necessary to give the name as shipped in
obs-deps the highest precedence.

This ensures that the "find_library" call will discover the less
version-specific variant of the library possibly installed via
Homebrew.
    @PatTheMav
    PatTheMav committed Sep 23, 2024
    Configuration menu
    Copy the full SHA
    e24ba16 View commit details
    Browse the repository at this point in the history