Skip to content

Commit c8faaaf

Browse files
committed
[ntuple] Always build tree/ntupleutil
All RNTuple code should always compile, while some interfaces remain in ROOT::Experimental.
1 parent 7f47672 commit c8faaaf

File tree

2 files changed

+1
-9
lines changed

2 files changed

+1
-9
lines changed

config/root-config.in

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ newlib="-lNew"
7474
rootglibs="-lGui"
7575
rootevelibs="-lEve -lEG -lGeom -lGed -lRGL"
7676
rootlibs="-lCore -lImt -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad -lROOTVecOps -lTree -lTreePlayer\
77-
-lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lROOTNTuple"
77+
-lRint -lPostscript -lMatrix -lPhysics -lMathCore -lThread -lROOTNTuple -lROOTNTupleUtil"
7878

7979
# MultiProc is not supported on Windows
8080
if test "$platform" != "win32"; then
@@ -85,10 +85,6 @@ if echo "${features}" | grep -q "dataframe"; then
8585
rootlibs="$rootlibs -lROOTDataFrame"
8686
fi
8787

88-
if echo "${features}" | grep -q "root7"; then
89-
rootlibs="$rootlibs -lROOTNTupleUtil"
90-
fi
91-
9288
if test "$platform" = "win32"; then
9389
rootulibs="-include:_G__cpp_setupG__Net \
9490
-include:_G__cpp_setupG__IO \

tree/ntupleutil/CMakeLists.txt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,6 @@
99
# @author Jakob Blomer CERN
1010
############################################################################
1111

12-
if(NOT root7)
13-
return()
14-
endif()
15-
1612
ROOT_STANDARD_LIBRARY_PACKAGE(ROOTNTupleUtil
1713
HEADERS
1814
ROOT/RNTupleImporter.hxx

0 commit comments

Comments
 (0)