Skip to content

Commit aedec41

Browse files
committed
[CMake] Fix vetoes for tutorials if numpy or xrootd are not available
Follows up on 45bef34, adding a veto if NumPy is not found. Also, move vetoes for tutorials when xrootd is not available to the right place.
1 parent 50a806b commit aedec41

File tree

1 file changed

+5
-2
lines changed

1 file changed

+5
-2
lines changed

tutorials/CMakeLists.txt

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -216,6 +216,7 @@ if(NOT xrootd)
216216
roofit/roofit/rf618_mixture_models.py # depends on df106_HiggsToFourLeptons.py
217217
visualisation/rcanvas/df104.py
218218
visualisation/rcanvas/df105.py
219+
io/tree/imt_parTreeProcessing.C
219220
)
220221
endif()
221222

@@ -281,8 +282,6 @@ endif()
281282
if(MSVC)
282283
#---Multiproc is not supported on Windows
283284
set(imt_veto ${imt_veto} analysis/parallel/mp*.C io/tree/mp*.C legacy/multicore/mp*.C multicore/mp*.C ./analysis/parallel/mtbb_parallelHistoFill.C)
284-
#---XRootD is not supported on Windows
285-
set(imt_veto ${imt_veto} io/tree/imt_parTreeProcessing.C)
286285
endif()
287286

288287
if(ROOT_CLASSIC_BUILD)
@@ -863,6 +862,7 @@ if(ROOT_pyroot_FOUND)
863862
#---Python tutorials dependencies--------------------------------------
864863
set(io-tree-ntuple1-depends tutorial-hsimple-py)
865864
set(hist-hist015_TH1_read_and_draw-depends tutorial-hsimple-py)
865+
set(hist-hist015_TH1_read_and_draw_uhi-depends tutorial-hsimple-py)
866866
set(math-fit-fit1-depends tutorial-hist-hist001_TH1_fillrandom-py)
867867
set(legacy-g3d-na49view-depends tutorial-legacy-g3d-geometry-py)
868868
set(roofit-roofit-rf503_wspaceread-depends tutorial-roofit-roofit-rf502_wspacewrite-py)
@@ -881,6 +881,9 @@ if(ROOT_pyroot_FOUND)
881881
# To add a new requirement, add a glob expression that's named requires_<packageName>,
882882
# and add it to the list "fixtureLists" below.
883883
file(GLOB requires_numpy RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}
884+
hsimple.py
885+
io/tree/ntuple1.py # indirect dependency from hsimple.py
886+
hist/hist015_TH1_read_and_draw.py # indirect dependency from hsimple.py
884887
analysis/dataframe/df017_vecOpsHEP.py
885888
analysis/dataframe/df026_AsNumpyArrays.py
886889
analysis/dataframe/df032_RDFFromNumpy.py

0 commit comments

Comments
 (0)