[v638][core] Generalize TROOT::GetSharedLibDir() also on Windows #21036
+145
−35
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
requested review from
bellenot,
couet,
dpiparo and
pcanal
as code owners
Test Results 19 files 19 suites 3d 12h 40m 34s ⏱️ For more details on these failures, see this check. Results for commit add84f5. ♻️ This comment has been updated with latest results. |
pcanal
approved these changes
Jan 26, 2026
pcanal
reviewed
Jan 26, 2026
| fs::path libDir = gROOT->GetSharedLibDir().Data(); | ||
| fs::path libDirRef = EXPECTED_SHARED_LIBRARY_DIR; | ||
|
|
||
| EXPECT_EQ(libDir, libDirRef); |
Member
There was a problem hiding this comment.
For some reasons this seems to fail ...
guitargeek
changed the title
This follows up on 47caba5, also generalizing the function on Windows by dynamically finding `libCore.dll` (or `Core.dll` depending on the toolchain). The goal is to avoid using `TROOT::GetRootSys()` in the implementation of this method, with the overarching goal of not having to rely on environment variables like `ROOTSYS` one day, which might not be set in some environments like the Python wheels. A unit test for `TROOT::GetSharedLibDir()` is also implemented. (cherry picked from commit ff7e631)
This is to avoid a warning when running the tutorials:
```txt
Processing /github/home/ROOT-CI/src/tutorials/machine_learning/TMVA_SOFIE_GNN_Application.C...
In file included from input_line_10:1:
##[error]/github/home/ROOT-CI/src/tutorials/machine_learning/TMVA_SOFIE_GNN_Application.C:14:10: fatal error: 'encoder.hxx' file not found
#include "encoder.hxx"
^~~~~~~~~~~~~
##[error]/github/home/ROOT-CI/src/tutorials/machine_learning/TMVA_SOFIE_GNN_Application.C:138:1: error: non-void function does not return a value [-Werror,-Wreturn-type]
}
^
```
(cherry picked from commit 50c9227)
The idea is to find the actual ROOT install directory, so we have to follow symlinks. The `info->dlpi_name` doesn't do that, so we need to do that ourselves with `fs::canonical()`. Closes root-project#21031. (cherry picked from commit f1af3d7)
guitargeek
merged commit 1160150
into
root-project:v6-38-00-patches
23 of 26 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
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.
Backport of ff7e631 requested by @vepadulano, for the fixes in
core/base/CMakeLists.txt.