Cleanup

Author: mconcas

macro/CMakeLists.txt

@@ -107,48 +107,27 @@ o2_add_test_root_macro(analyzeOriginHits.C
                        PUBLIC_LINK_LIBRARIES O2::SimulationDataFormat
                                              O2::DetectorsCommonDataFormats)
 
-if (ENABLE_UPGRADES)
-  o2_add_test_root_macro(build_geometry.C
-                         PUBLIC_LINK_LIBRARIES O2::DetectorsPassive
-                                               O2::Alice3DetectorsPassive
-                                               O2::Field
-                                               O2::TPCSimulation
-                                               O2::ITSSimulation
-                                               O2::ITS3Simulation
-                                               O2::TRKSimulation
-                                               O2::MFTSimulation
-                                               O2::MCHSimulation
-                                               O2::MIDSimulation
-                                               O2::EMCALSimulation
-                                               O2::TOFSimulation
-                                               O2::TRDSimulation
-                                               O2::FT0Simulation
-                                               O2::FV0Simulation
-                                               O2::FDDSimulation
-                                               O2::HMPIDSimulation
-                                               O2::PHOSSimulation
-                                               O2::CPVSimulation
-                                               O2::ZDCSimulation)
-else()
-  o2_add_test_root_macro(build_geometry.C
-                         PUBLIC_LINK_LIBRARIES O2::DetectorsPassive
-                                               O2::Field
-                                               O2::TPCSimulation
-                                               O2::ITSSimulation
-                                               O2::MFTSimulation
-                                               O2::MCHSimulation
-                                               O2::MIDSimulation
-                                               O2::EMCALSimulation
-                                               O2::TOFSimulation
-                                               O2::TRDSimulation
-                                               O2::FT0Simulation
-                                               O2::FV0Simulation
-                                               O2::FDDSimulation
-                                               O2::HMPIDSimulation
-                                               O2::PHOSSimulation
-                                               O2::CPVSimulation
-                                               O2::ZDCSimulation)
-endif()
+o2_add_test_root_macro(build_geometry.C
+                       PUBLIC_LINK_LIBRARIES O2::DetectorsPassive
+                                             O2::Field
+                                             O2::TPCSimulation
+                                             O2::ITSSimulation
+                                             O2::MFTSimulation
+                                             O2::MCHSimulation
+                                             O2::MIDSimulation
+                                             O2::EMCALSimulation
+                                             O2::TOFSimulation
+                                             O2::TRDSimulation
+                                             O2::FT0Simulation
+                                             O2::FV0Simulation
+                                             O2::FDDSimulation
+                                             O2::HMPIDSimulation
+                                             O2::PHOSSimulation
+                                             O2::CPVSimulation
+                                             O2::ZDCSimulation
+                                             $<$<BOOL:${ENABLE_UPGRADES}>:O2::Alice3DetectorsPassive>
+                                             $<$<BOOL:${ENABLE_UPGRADES}>:O2::ITS3Simulation>
+                                             $<$<BOOL:${ENABLE_UPGRADES}>:O2::TRKSimulation>)
 
 o2_add_test_root_macro(checkTOFMatching.C
                        PUBLIC_LINK_LIBRARIES O2::GlobalTracking