Skip to content

[config] Add TGeometry link flag only when available #22941

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

Merged
vepadulano merged 2 commits into from
Jul 30, 2026
Merged

[config] Add TGeometry link flag only when available #22941

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
75fb431
[config] Add TGeometry link flag only when available
vepadulano Jul 28, 2026
a303e96
[test] Add PostInstall test for root-config
vepadulano Jul 28, 2026
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: 5 additions & 1 deletion config/root-config.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fi
newlib="-lNew"
rootglibs="-lGui"
rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lTGeometry -lGpad -lROOTVecOps -lTree -lTreePlayer\
rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
-lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lROOTNTuple -lROOTNTupleUtil"

# MultiProc is not supported on Windows
Expand All @@ -85,6 +85,10 @@ if echo "${features}" | grep -q "dataframe"; then
rootlibs="$rootlibs -lROOTDataFrame"
fi

if echo "${features}" | grep -q "geom"; then
rootlibs="$rootlibs -lTGeometry"
fi

if test "$platform" = "win32"; then
rootulibs="-include:_G__cpp_setupG__Net \
-include:_G__cpp_setupG__IO \
Expand Down
18 changes: 18 additions & 0 deletions test/PostInstall/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,24 @@ if(BUILD_TESTING)
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_tests_properties(run-hsimple PROPERTIES FIXTURES_SETUP HSIMPLE)
set_tests_properties(read-hsimple PROPERTIES FIXTURES_REQUIRED HSIMPLE)

# Add a test to check root-config gives the right compiler invocation flags
execute_process(
COMMAND ${ROOT_BINDIR}/root-config --cflags --libs
OUTPUT_VARIABLE ROOT_CONFIG_OUTPUT_STR
OUTPUT_STRIP_TRAILING_WHITESPACE)
# Pass a list to the compiler invocation to avoid errors such as "invalid library name" when passing the quoted string
# output from root-config
string(REPLACE " " ";" ROOT_CONFIG_OUTPUT "${ROOT_CONFIG_OUTPUT_STR}")
add_test(NAME read-hsimple-root-config-build
COMMAND ${CMAKE_CXX_COMPILER} -o readHSimple-root-config ${CMAKE_SOURCE_DIR}/readHSimple.cxx ${ROOT_CONFIG_OUTPUT}
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
add_test(NAME read-hsimple-root-config-run
COMMAND readHSimple-root-config
WORKING_DIRECTORY ${CMAKE_BINARY_DIR})
set_tests_properties(read-hsimple-root-config-build PROPERTIES FIXTURES_SETUP HSIMPLE-ROOT-CONFIG)
set_tests_properties(read-hsimple-root-config-run PROPERTIES FIXTURES_REQUIRED "HSIMPLE;HSIMPLE-ROOT-CONFIG")

if(ROOT_pyroot_FOUND)
find_package(Python3 3.10 REQUIRED)
# Need to duplicate the import ROOT test because the PASS_REGULAR_EXPRESSION
Expand Down
Loading