-
Notifications
You must be signed in to change notification settings - Fork 39.2k
build: add root dir to CMAKE_PREFIX_PATH in toolchain #32798
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -92,6 +92,22 @@ set(CMAKE_FIND_ROOT_PATH_MODE_INCLUDE ONLY) | |
| set(CMAKE_FIND_ROOT_PATH_MODE_PACKAGE ONLY) | ||
| set(QT_TRANSLATIONS_DIR "${CMAKE_CURRENT_LIST_DIR}/translations") | ||
|
|
||
| # The following is only necessary when using cmake from Nix or NixOS, because | ||
| # Nix patches cmake to remove the root directory `/` from | ||
| # CMAKE_SYSTEM_PREFIX_PATH. Adding it back is harmless on other platforms and | ||
| # necessary on Nix because without it cmake find_path, find_package, etc | ||
| # functions do not know where to look in CMAKE_FIND_ROOT_PATH for dependencies | ||
| # (https://github.com/bitcoin/bitcoin/issues/32428). | ||
|
Comment on lines
+97
to
+100
Member
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. To be precise, "Adding it back ... on other platforms" does not occur on every other platform that supports our depends build subsystem. According to the CMake source code, |
||
| # | ||
| # TODO: longer term, it may be possible to use a dependency provider, which | ||
| # would bring the find_package calls completely under our control, making this | ||
| # patch unnecessary. | ||
| # | ||
| # Make sure we only append once, as this file may be called repeatedly. | ||
| if(NOT "/" IN_LIST CMAKE_PREFIX_PATH) | ||
| list(APPEND CMAKE_PREFIX_PATH "/") | ||
| endif() | ||
|
|
||
| if(CMAKE_SYSTEM_NAME STREQUAL "Darwin" AND NOT CMAKE_HOST_APPLE) | ||
| # The find_package(Qt ...) function internally uses find_library() | ||
| # calls for all dependencies to ensure their availability. | ||
|
|
||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.