Skip to content

Commit eb1ccbb

Browse files
committed
[tutorials] Simplify ROOT 7 vetos
1 parent 4a25c67 commit eb1ccbb

File tree

1 file changed

+6
-13
lines changed

1 file changed

+6
-13
lines changed

tutorials/CMakeLists.txt

Lines changed: 6 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -389,15 +389,7 @@ if(root7)
389389
tutorials/visualisation/webgui/browserv7/filedialog.cxx
390390
tutorials/visualisation/webgui/fitpanelv7/fitpanel6.cxx
391391
)
392-
if(NOT davix)
393-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
394-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
395-
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
396-
endif()
397392
if(NOT dataframe)
398-
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
399-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
400-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
401393
list(APPEND root7_veto visualisation/rcanvas/df104.py)
402394
list(APPEND root7_veto visualisation/rcanvas/df105.py)
403395
endif()
@@ -413,13 +405,14 @@ else()
413405
endif()
414406
file(GLOB v7_veto_files RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ visualisation/webgui/browserv7/*.cxx visualisation/webgui/fitpanelv7/*.cxx visualisation/rcanvas/*.py visualisation/rcanvas/*.cxx)
415407
list(APPEND root7_veto ${v7_veto_files})
416-
# This depends on ntupleutil
417-
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
418408
# This depends on RCanvas
419409
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
420-
if((NOT davix) OR (NOT dataframe))
421-
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
422-
endif()
410+
endif()
411+
412+
if(NOT davix OR NOT dataframe)
413+
list(APPEND root7_veto io/ntuple/ntpl004_dimuon.C)
414+
list(APPEND root7_veto io/ntuple/ntpl008_import.C)
415+
list(APPEND root7_veto io/ntuple/ntpl011_global_temperatures.C)
423416
endif()
424417

425418
#---These ones are disabled !!! ------------------------------------

0 commit comments

Comments
 (0)