services/io/podio: remove unused datamodel_LinkDef.h

cmake/jana_plugin.cmake

@@ -107,6 +107,17 @@ macro(plugin_add _name)
   endif()
 endmacro()
 
+# add_dependencies for both a plugin and a library
+macro(plugin_add_dependencies _name)
+  if(${_name}_WITH_PLUGIN)
+    add_dependencies(${_name}_plugin ${ARGN})
+  endif(${_name}_WITH_PLUGIN)
+
+  if(${_name}_WITH_LIBRARY)
+    add_dependencies(${_name}_library ${ARGN})
+  endif(${_name}_WITH_LIBRARY)
+endmacro()
+
 # target_link_libraries for both a plugin and a library
 macro(plugin_link_libraries _name)
   if(${_name}_WITH_PLUGIN)

src/services/io/podio/CMakeLists.txt

@@ -31,11 +31,6 @@ file(RELATIVE_PATH DATAMODEL_RELATIVE_PATH ${PROJECT_SOURCE_DIR}/src
      ${CMAKE_CURRENT_SOURCE_DIR})
 
 # Generate the datamodel header files.
-add_custom_command(
-  OUTPUT ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}
-  COMMAND ${CMAKE_COMMAND} -E make_directory
-          ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}
-  COMMENT Create datamodel glue directory)
 add_custom_command(
   OUTPUT
     ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}/datamodel_glue.h
@@ -46,9 +41,15 @@ add_custom_command(
     EDM4HEP_INCLUDE_DIR=${EDM4HEP_INTERFACE_INCLUDE_DIRECTORIES}
     EDM4EIC_INCLUDE_DIR=${EDM4EIC_INTERFACE_INCLUDE_DIRECTORIES}
   MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/make_datamodel_glue.py
-  DEPENDS ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}
-          ${EDM_VERSION_INCLUDES}
-  COMMENT Create datamodel glue headers)
+  DEPENDS ${EDM_VERSION_INCLUDES}
+  COMMENT "Create datamodel glue headers")
+add_custom_target(
+  podio_datamodel_glue
+  DEPENDS
+    ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}/datamodel_glue.h
+  COMMENT "Create datamodel glue headers")
+
+plugin_add_dependencies(${PLUGIN_NAME} podio_datamodel_glue)
 
 # Install datamodel_glue headers
 install(
@@ -70,16 +71,3 @@ plugin_link_libraries(
   EDM4EIC::edm4eic
   EDM4EIC::edm4eic_utils
   podio::podioRootIO)
-
-# Create a ROOT dictionary with the vector<edm4hep::XXXData> types defined.
-# Without this, root will complain about not having a compiled CollectionProxy.
-root_generate_dictionary(
-  G__datamodel_vectors
-  ${PROJECT_BINARY_DIR}/include/${DATAMODEL_RELATIVE_PATH}/datamodel_includes.h
-  MODULE ${PLUGIN_NAME}_plugin LINKDEF datamodel_LinkDef.h)
-
-# Install root dictionaries made by PODIO
-set(my_root_dict_files
-    ${CMAKE_CURRENT_BINARY_DIR}/lib${PLUGIN_NAME}_plugin_rdict.pcm
-    ${CMAKE_CURRENT_BINARY_DIR}/lib${PLUGIN_NAME}_plugin.rootmap)
-install(FILES ${my_root_dict_files} DESTINATION ${PLUGIN_OUTPUT_DIRECTORY})

src/services/io/podio/make_datamodel_glue.py

@@ -99,7 +99,9 @@ def AddCollections(datamodelName, collectionfiles):
 AddCollections('edm4eic'   , collectionfiles_edm4eic   )
 
 
-if WORKING_DIR : os.chdir( WORKING_DIR )
+if WORKING_DIR:
+    os.makedirs(WORKING_DIR, exist_ok=True)
+    os.chdir(WORKING_DIR)
 
 with open('datamodel_includes.h', 'w') as f:
     f.write('\n// This file automatically generated by the make_datamodel.py script\n\n')