Make Boost general requirement for DD4hep

.dd4hep-ci.d/compile_and_test.sh

@@ -8,7 +8,7 @@ source /DD4hep/.dd4hep-ci.d/init_x86_64.sh
 cd /DD4hep
 mkdir build
 cd build
-cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" .. && \
+cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" .. && \
 ninja && \
 ninja install && \
 . ../bin/thisdd4hep.sh && \

.dd4hep-ci.d/coverity_scan.sh

@@ -7,7 +7,7 @@ source /Package/.dd4hep-ci.d/init_x86_64.sh
 cd /Package
 mkdir build
 cd build
-cmake -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" .. && \
+cmake -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS -DCMAKE_CXX_FLAGS="-fdiagnostics-color=always" .. && \
 export PATH=/cov-analysis-linux64/bin:$PATH && \
 cov-build --dir cov-int make -j4 && \
 tar czvf myproject.tgz cov-int

.gitlab-ci.yml

@@ -7,7 +7,7 @@ slc6-gcc7-Geant10.2:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON  -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -29,7 +29,7 @@ slc6-llvm40-Geant10.2:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -52,7 +52,7 @@ slc6-ggc7-Geant10.3:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX14=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX14=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -74,7 +74,7 @@ slc6-gcc7-Geant10.2-XERCESC:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -96,7 +96,7 @@ centos7-gcc7-Geant10.2:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -119,7 +119,7 @@ centos7-llvm40-Geant10.2:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -142,7 +142,7 @@ centos7-llvm40-Geant10.3-XERCESC:
     - source .dd4hep-ci.d/init_x86_64.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX14=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.3.1 -D DD4HEP_USE_CXX14=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -162,7 +162,7 @@ mac1012-clang80:
     - source .dd4hep-ci.d/init_mac.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh
@@ -182,7 +182,7 @@ mac1012-clang80-XERCESC:
     - source .dd4hep-ci.d/init_mac.sh
     - mkdir build
     - cd build
-    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
+    - cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DDD4HEP_USE_XERCESC=ON -DXERCESC_ROOT_DIR=${XercesC_HOME} -DROOT_DIR=$ROOTSYS ..
     - ninja
     - ninja install
     - . ../bin/thisdd4hep.sh

CMakeLists.txt

@@ -50,10 +50,14 @@ dd4hep_configure_output( OUTPUT "${PROJECT_BINARY_DIR}" INSTALL "${CMAKE_INSTALL
 #
 # Include ROOT
 #
-find_package ( ROOT REQUIRED COMPONENTS Geom GenVector Eve Gui Graf3d RGL EG)
+find_package ( ROOT 6.08 REQUIRED COMPONENTS Geom GenVector Eve Gui Graf3d RGL EG)
 include(${ROOT_USE_FILE})
 message ( STATUS "ROOT_VERSION: ${ROOT_VERSION}" )
-
+#
+# Include Boost
+#
+find_package( Boost 1.49 REQUIRED )
+add_definitions( -DBOOST_SPIRIT_USE_PHOENIX_V3 )
 #---------------------------------------------------------------------------------------------------
 #fg: moved to here from DD4hep.cmake to not force CMAKE_CXX_FLAGS upon dependent packages
 dd4hep_set_compiler_flags()

DDCore/include/DD4hep/detail/BasicGrammar_inl.h

@@ -25,7 +25,6 @@
 #include "DD4hep/Primitives.h"
 #include "DD4hep/BasicGrammar.h"
 
-#ifdef DD4HEP_USE_BOOST
 #if defined(DD4HEP_PARSER_HEADER)
 
 #define DD4HEP_NEED_EVALUATOR
@@ -40,7 +39,6 @@
 #include "DDParsers/Evaluator.h"
 namespace dd4hep { XmlTools::Evaluator& g4Evaluator();  }
 #endif
-#endif
 namespace {  static XmlTools::Evaluator& s__eval(dd4hep::g4Evaluator());  }
 
 // C/C++ include files
@@ -115,9 +113,7 @@ namespace dd4hep {
   template <typename TYPE> bool Grammar<TYPE>::fromString(void* ptr, const std::string& string_val) const {
     int sc = 0;
     TYPE temp;
-#ifdef DD4HEP_USE_BOOST
     sc = ::dd4hep::Parsers::parse(temp,string_val);
-#endif
     if ( !sc ) sc = evaluate(&temp,string_val);
 #if 0
     std::cout << "Sc=" << sc << "  Converting value: " << string_val 
@@ -128,29 +124,15 @@ namespace dd4hep {
       *(TYPE*)ptr = temp;
       return true;
     }
-#ifndef DD4HEP_USE_BOOST
-    throw std::runtime_error("This version of DD4HEP is not compiled to use boost::spirit.\n"
-                             "To enable elaborated property handling set DD4HEP_USE_BOOST=ON\n"
-                             "and BOOST_INCLUDE_DIR=<boost include path>");
-#else
     BasicGrammar::invalidConversion(string_val, typeid(TYPE));
     return false;
-#endif
   }
 
   /// Serialize a property to a string
   template <typename TYPE> std::string Grammar<TYPE>::str(const void* ptr) const {
-#ifdef DD4HEP_USE_BOOST
     std::stringstream string_rep;
     Utils::toStream(*(TYPE*)ptr,string_rep);
     return string_rep.str();
-#else
-    if (ptr) {
-    }
-    throw std::runtime_error("This version of DD4HEP is not compiled to use boost::spirit.\n"
-                             "To enable elaborated property handling set DD4HEP_USE_BOOST=ON\n"
-                             "and BOOST_INCLUDE_DIR=<boost include path>");
-#endif
   }
 
   /// Helper function to parse data type
@@ -243,7 +225,6 @@ namespace dd4hep {
 
   /// Container evaluator
   template <typename TYPE> static int eval_container(TYPE* p, const std::string& str)  {
-#ifdef DD4HEP_USE_BOOST
     std::vector<std::string> buff;
     int sc = Parsers::parse(buff,str);
     if ( sc )  {
@@ -263,9 +244,6 @@ namespace dd4hep {
         return fill_data(p,buff);
       }
     }
-#else
-    if ( p && str.empty() ) return 0;
-#endif
     return 0;
   }
 
@@ -276,16 +254,12 @@ namespace dd4hep {
       val.erase(idx, 5);
     while (val[0] == ' ')
       val.erase(0, 1);
-#ifdef DD4HEP_USE_BOOST
     double result = s__eval.evaluate(val.c_str());
     if (s__eval.status() != XmlTools::Evaluator::OK) {
       return 0;
     }
     *ptr = (T)result;
     return 1;
-#else
-    return 0;
-#endif
   }
 
   /// String evaluator

DDCore/src/plugins/JsonProcessor.cpp

@@ -10,7 +10,6 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#ifdef DD4HEP_USE_BOOST
 
 /**
    Note:
@@ -157,6 +156,3 @@ static long handle_json(Detector& description, int argc, char** argv) {
   return 1;
 }
 DECLARE_APPLY(DD4hep_JsonProcessor,handle_json)
-
-#endif  // DD4HEP_USE_BOOST
-

README.md

@@ -39,7 +39,7 @@ system before building and running the examples
 
 - **Mandatory**
 
-  CMake (version 2.8 or higher), ROOT (version 5.30 or higher) and Boost installations are mandatory.
+  CMake (version 3.3 or higher), ROOT (version 6.08 or higher) and Boost (version 1.49 or higher) installations are mandatory.
 
 - **Optional**
 

bootstrap.sh

@@ -14,9 +14,9 @@ STRING=$(env LC_CTYPE=C tr -dc "a-zA-Z0-9-_\$\?" < /dev/urandom | head -c 4)
 mkdir build_${STRING}
 cd build_${STRING}
 if [ "$(uname)" == "Darwin" ]; then
-    cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
 else
-    cmake -GNinja -D DD4HEP_USE_GEANT4=ON -D DD4HEP_USE_BOOST=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.2 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
+    cmake -GNinja -D DD4HEP_USE_GEANT4=ON -DBoost_NO_BOOST_CMAKE=ON -D DD4HEP_USE_LCIO=ON -D BUILD_TESTING=ON -D Geant4_DIR=$G4INSTALL/lib64/Geant4-10.2.3 -D DD4HEP_USE_CXX11=ON -DCMAKE_BUILD_TYPE=Release -DROOT_DIR=$ROOTSYS ..
 fi
 ninja
 ninja install

cmake/DD4hep.cmake

@@ -19,22 +19,6 @@ if(CMAKE_INSTALL_PREFIX)
 endif()
 
 #---------------------------------------------------------------------------------------------------
-#  Need this fix, since the cmake name is Geant4 and on GEANT4
-if(DD4HEP_USE_GEANT4)
-  set ( DD4HEP_USE_BOOST ON )    # Boost is required !
-endif()
-#---------------------------------------------------------------------------------------------------
-if(DD4HEP_USE_BOOST)
-  #message(FATAL_ERROR "Boost is required   ${DD4HEP_USE_BOOST}")
-  if ( "${Boost_INCLUDE_DIRS}" STREQUAL "" )
-    find_package( Boost REQUIRED ) 
-    ##include_directories( SYSTEM ${Boost_INCLUDE_DIRS} )
-  endif()
-  add_definitions( -DDD4HEP_USE_BOOST )
-  add_definitions( -DBOOST_SPIRIT_USE_PHOENIX_V3 )
-else()
-  set ( DD4HEP_USE_BOOST OFF )
-endif()
 # Main functional include file
 if ( "${DD4hepBuild_included}" STREQUAL "" )
   include ( DD4hepBuild )

cmake/DD4hepBuild.cmake

@@ -251,7 +251,6 @@ function ( dd4hep_print_options )
   dd4hep_print ( "|  DD4hep build setup:                                                          " )
   dd4hep_print ( "|                                                                               " )
   dd4hep_print ( "|  CMAKE_MODULE_PATH:  ${CMAKE_MODULE_PATH}                                     " )
-  dd4hep_print ( "|  DD4HEP_USE_BOOST:   ${DD4HEP_USE_BOOST}  DD4HEP_USE_Boost:${DD4HEP_USE_Boost}" )
   dd4hep_print ( "|  DD4HEP_USE_XERCESC: ${DD4HEP_USE_XERCESC}                                    " )
   dd4hep_print ( "|  XERCESC_ROOT_DIR:   ${XERCESC_ROOT_DIR}                                      " )
   dd4hep_print ( "|  DD4HEP_USE_LCIO:    ${DD4HEP_USE_LCIO}                                       " )

cmake/DD4hepConfig.cmake.in

@@ -17,7 +17,6 @@ set ( DD4hep_DIR         "$ENV{DD4hep_DIR}" )
 set ( DD4hep_ROOT        "$ENV{DD4hep_ROOT}" )
 set ( DD4hep_VERSION     "@DD4hep_VERSION@" )
 set ( DD4hep_SOVERSION   "@DD4hep_SOVERSION@" )
-set ( DD4HEP_USE_BOOST   "@DD4HEP_USE_BOOST@" )
 set ( DD4HEP_USE_GEANT4  "@DD4HEP_USE_GEANT4@" )
 set ( DD4HEP_USE_XERCESC "@DD4HEP_USE_XERCESC@" )
 set ( DD4HEP_USE_CXX11   "@DD4HEP_USE_CXX11@" )

examples/ClientTests/src_boost/JsonDumper.cpp

@@ -10,7 +10,6 @@
 // Author     : M.Frank
 //
 //==========================================================================
-#ifdef DD4HEP_USE_BOOST
 
 // Framework include files
 #include "JSON/Elements.h"
@@ -32,5 +31,3 @@ static long json_dump(Detector& /* description */, int argc, char** argv)   {
   return 1;
 }
 DECLARE_APPLY(DD4hep_JsonDumper,json_dump)
-
-#endif