[Python] Fix ROOT include directory resolution for Python wheels #20915
+15
−1
Conversation
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
guitargeek
added
bug
in:Python Interface
build-python-wheels
Contributor
Author
|
A more robust alternative to this hotfix: |
As of commit a5b1ed9, ROOT became smarter about finding the include path in the install tree, inferring the correct relative path from $ROOTSYS and the CMAKE_INSTALL_INCLUDEDIR variable at build time. Before, that only happened for `gnuinstall=ON`, but now it always happens. However, for the Python wheel, we are breaking the assumptions that ROOT makes by moving around directories in the install tree. Fortunately, we are moving directories around such that in the end, it has same structure as the build tree. Hence, we put the build tree marker in the Python package, so ROOT thinks the relative resource paths from the build tree apply.
guitargeek
force-pushed
the
getincludedir_fixup
branch
from
0c85761 to
690c9cb
Compare
Test Results 22 files 22 suites 3d 14h 5m 12s ⏱️ Results for commit 690c9cb. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
1 participant
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.
As of commit a5b1ed9, ROOT became smarter about finding the include path in the install tree, inferring the correct relative path from $ROOTSYS and the CMAKE_INSTALL_INCLUDEDIR variable at build time. Before, that only happened for
gnuinstall=ON, but now it always happens.However, for the Python wheel, we are breaking the assumptions that ROOT makes by moving around directories in the install tree. Fortunately, we are moving directories around such that in the end, it has same structure as the build tree. Hence, we put the build tree marker in the Python package, so ROOT thinks the relative resource paths from the build tree apply.