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

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
+3 −1
Open

cmake: Disable discovery of Homebrew libraries for dependencies #11299

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c98c122
cmake: Disable discovery of Homebrew libraries for dependencies
PatTheMav Sep 18, 2024
07ca0c9
cmake: Change library discovery order in LuaJIT find module
PatTheMav Sep 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cmake/finders/FindLuajit.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@ endif()

find_library(
Luajit_LIBRARY
NAMES luajit luajit-51 luajit-5.1 lua51
NAMES luajit-5.1 luajit-51 luajit lua51
HINTS ${PC_Luajit_LIBRARY_DIRS}
PATHS /usr/lib /usr/local/lib
DOC "Luajit location"
Expand Down
2 changes: 2 additions & 0 deletions cmake/macos/defaults.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,8 @@ set(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE)
set(CMAKE_INSTALL_RPATH_USE_LINK_PATH FALSE)
# Use common bundle-relative RPATH for installed targets
set(CMAKE_INSTALL_RPATH "@executable_path/../Frameworks")
# Ignore any dependent packages installed via Homebrew
list(APPEND CMAKE_IGNORE_PREFIX_PATH "/opt/homebrew" "/usr/local/lib")
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Suggested change
list(APPEND CMAKE_IGNORE_PREFIX_PATH "/opt/homebrew" "/usr/local/lib")
list(APPEND CMAKE_IGNORE_PREFIX_PATH "/opt/homebrew" "/opt/homebrew/lib" "/usr/local" "/usr/local/lib")

Per previous comment.


# Used for library exports only (obs-frontend-api)
set(OBS_LIBRARY_DESTINATION "lib")
Expand Down
Loading