Skip to content

build(deps): keep Homebrew out of local dependency child builds #5361

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

Draft
zachlewis wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −0
Draft

build(deps): keep Homebrew out of local dependency child builds #5361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 6 additions & 0 deletions CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -216,6 +216,12 @@ if (IGNORE_HOMEBREWED_DEPS)
)
endforeach ()

# Also ignore the whole prefixes, which (unlike CMAKE_IGNORE_PATH) is
# honored by config-package searches, and is forwarded to local
# dependency child builds so they can't quietly resolve a Homebrew
# package (e.g. a mismatched Imath) that we ourselves are ignoring.
list (APPEND CMAKE_IGNORE_PREFIX_PATH ${HOMEBREW_PREFIXES})

message (STATUS "CMAKE_IGNORE_PATH: ${CMAKE_IGNORE_PATH}")
endif ()

Expand Down
4 changes: 4 additions & 0 deletions src/cmake/dependency_utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -694,6 +694,10 @@ macro (build_dependency_with_cmake pkgname)
string(REPLACE ";" "\\;" CMAKE_IGNORE_PATH_ESCAPED "${CMAKE_IGNORE_PATH}")
list(APPEND _pkg_CMAKE_ARGS "-DCMAKE_IGNORE_PATH=${CMAKE_IGNORE_PATH_ESCAPED}")
endif()
if (CMAKE_IGNORE_PREFIX_PATH)
string(REPLACE ";" "\\;" CMAKE_IGNORE_PREFIX_PATH_ESCAPED "${CMAKE_IGNORE_PREFIX_PATH}")
list(APPEND _pkg_CMAKE_ARGS "-DCMAKE_IGNORE_PREFIX_PATH=${CMAKE_IGNORE_PREFIX_PATH_ESCAPED}")
endif()

# Pass along any CMAKE_MSVC_RUNTIME_LIBRARY
if (WIN32 AND CMAKE_MSVC_RUNTIME_LIBRARY)
Expand Down
Loading