Streamline dataframe/CMakeLists.txt

Author: eguiraud

root/tree/dataframe/CMakeLists.txt

@@ -4,6 +4,10 @@ RB_ADD_GBENCHMARK(RDFBenchmarks
     LABEL short
     LIBRARIES Core Hist Imt RIO Tree TreePlayer ROOTDataFrame ROOTVecOps)
 
+if(NUMPY_FOUND)
+    RB_ADD_PYTESTBENCHMARK(pytest-rdataframe-asnumpy rdataframe_asnumpy.py LABEL short)
+endif()
+
 if(rootbench-datafiles)
     RB_ADD_GBENCHMARK(gbenchmark-df102_NanoAODDimuonAnalysis
         df102_NanoAODDimuonAnalysis.C
@@ -16,13 +20,7 @@ if(rootbench-datafiles)
         LABEL long
         DOWNLOAD_DATAFILES h1analysis.root
         LIBRARIES Core Hist Imt RIO Tree TreePlayer ROOTDataFrame ROOTVecOps)
-endif()
 
-if(NUMPY_FOUND)
-    RB_ADD_PYTESTBENCHMARK(pytest-rdataframe-asnumpy rdataframe_asnumpy.py LABEL short)
-endif()
-
-if(rootbench-datafiles)
     RB_ADD_PYTESTBENCHMARK(pytest-df102_NanoAODDimuonAnalysis
         df102_NanoAODDimuonAnalysis.py
         DOWNLOAD_DATAFILES Run2012B_DoubleMuParked.root Run2012C_DoubleMuParked.root
@@ -32,14 +30,14 @@ if(rootbench-datafiles)
         df104_HiggsToTwoPhotons.py
         DOWNLOAD_DATAFILES data_A.GamGam.root data_B.GamGam.root data_C.GamGam.root data_D.GamGam.root mc_343981.ggH125_gamgam.GamGam.root mc_345041.VBFH125_gamgam.GamGam.root
         LABEL long)
+
+    if (CMAKE_CXX_FLAGS MATCHES "-std=c\\+\\+17" OR CMAKE_CXX_STANDARD GREATER 14)
+        RB_ADD_GBENCHMARK(ZPeak
+           zpeak.cxx
+           LIBRARIES Core Hist Imt RIO MathCore Physics Tree TreePlayer ROOTDataFrame ROOTVecOps
+           DOWNLOAD_DATAFILES zpeak_data_small.root
+           LABEL long)
+    endif()
 endif()
 
 add_subdirectory(LoopSUSYFrame)
-
-if(rootbench-datafiles AND ((CMAKE_CXX_FLAGS MATCHES "-std=c\\+\\+17") OR (CMAKE_CXX_STANDARD GREATER 14)))
-   RB_ADD_GBENCHMARK(ZPeak
-      zpeak.cxx
-      LIBRARIES Core Hist Imt RIO MathCore Physics Tree TreePlayer ROOTDataFrame ROOTVecOps
-      DOWNLOAD_DATAFILES zpeak_data_small.root
-      LABEL long)
-endif()