diff --git a/DDCore/src/gdml/GdmlPlugins.cpp b/DDCore/src/gdml/GdmlPlugins.cpp index 20d484c6ec83dbfd1b5f62c9ea11dc462802cc7a..00b719f0f7d2d7829dd9c0e88c93dd2ff5b415d9 100644 --- a/DDCore/src/gdml/GdmlPlugins.cpp +++ b/DDCore/src/gdml/GdmlPlugins.cpp @@ -29,7 +29,7 @@ using namespace std; using namespace dd4hep; -#ifdef DD4HEP_HAVE_HIGHER_ROOT_VERSION +#ifdef ROOT_VERSION_CODE >= ROOT_VERSION(6,13,1) /// ROOT GDML reader plugin /** diff --git a/examples/CLICSiD/CMakeLists.txt b/examples/CLICSiD/CMakeLists.txt index a0104f5cc71dae26d1bca1bf1db9b5bee47ed030..358da75ee5db9630efe2d2c1c8fe0c485e8deca3 100644 --- a/examples/CLICSiD/CMakeLists.txt +++ b/examples/CLICSiD/CMakeLists.txt @@ -58,7 +58,7 @@ dd4hep_add_test_reg( CLICSiD_check_overlaps_LONGTEST --tolerance=0.1 REGEX_PASS " Execution finished..." ) # -if (DD4HEP_HAVE_HIGHER_ROOT_VERSION) +###if (DD4HEP_HAVE_HIGHER_ROOT_VERSION) # ROOT Geometry export to GDML dd4hep_add_test_reg( CLICSiD_GDML_export_LONGTEST COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" @@ -82,22 +82,23 @@ dd4hep_add_test_reg( CLICSiD_GDML_export_LONGTEST dd4hep_add_test_reg( CLICSiD_GDML_import_LONGTEST COMMAND "${CMAKE_INSTALL_PREFIX}/bin/run_test_CLICSiD.sh" EXEC_ARGS geoPluginRun -input file:${CMAKE_CURRENT_SOURCE_DIR}/compact/compact_nocalo.xml -print WARNING -destroy -volmgr - -plugin DD4hep_ROOTGDMLParse -input EcalBarrel.gdml -path /world/EcalBarrel - -plugin DD4hep_ROOTGDMLParse -input EcalEndcap.gdml -path /world/EcalEndcap - -plugin DD4hep_ROOTGDMLParse -input HcalBarrel.gdml -path /world/HcalBarrel - -plugin DD4hep_ROOTGDMLParse -input HcalEndcap.gdml -path /world/HcalEndcap - -plugin DD4hep_ROOTGDMLParse -input HcalPlug.gdml -path /world/HcalPlug - -plugin DD4hep_ROOTGDMLParse -input MuonBarrel.gdml -path /world/MuonBarrel - -plugin DD4hep_ROOTGDMLParse -input MuonEndcap.gdml -path /world/MuonEndcap - -plugin DD4hep_ROOTGDMLParse -input LumiCal.gdml -path /world/LumiCal - -plugin DD4hep_ROOTGDMLParse -input BeamCal.gdml -path /world/BeamCal - -plugin DD4hep_ROOTGDMLParse -input LumiReadout_Forward.gdml -path /world/LumiReadout_Forward - -plugin DD4hep_ROOTGDMLParse -input LumiReadout_Backward.gdml -path /world/LumiReadout_Backward + -plugin DD4hep_ROOTGDMLParse -input EcalBarrel.gdml -path /world/EcalBarrel + -plugin DD4hep_ROOTGDMLParse -input EcalEndcap.gdml -path /world/EcalEndcap + -plugin DD4hep_ROOTGDMLParse -input HcalBarrel.gdml -path /world/HcalBarrel + -plugin DD4hep_ROOTGDMLParse -input HcalEndcap.gdml -path /world/HcalEndcap + -plugin DD4hep_ROOTGDMLParse -input HcalPlug.gdml -path /world/HcalPlug + -plugin DD4hep_ROOTGDMLParse -input MuonBarrel.gdml -path /world/MuonBarrel + -plugin DD4hep_ROOTGDMLParse -input MuonEndcap.gdml -path /world/MuonEndcap + -plugin DD4hep_ROOTGDMLParse -input LumiCal.gdml -path /world/LumiCal + -plugin DD4hep_ROOTGDMLParse -input BeamCal.gdml -path /world/BeamCal + -plugin DD4hep_ROOTGDMLParse -input LumiReadout_Forward.gdml -path /world/LumiReadout_Forward + -plugin DD4hep_ROOTGDMLParse -input LumiReadout_Backward.gdml -path /world/LumiReadout_Backward -plugin DD4hep_VolumeDump --topstat + DEPENDS CLICSiD_GDML_export_LONGTEST REGEX_PASS "Checked 130738 physical volume placements" REGEX_FAIL "Exception;EXCEPTION;ERROR" ) # -endif(DD4HEP_HAVE_HIGHER_ROOT_VERSION) +####endif(DD4HEP_HAVE_HIGHER_ROOT_VERSION) # #---Geant4 Testsing----------------------------------------------------------------- #