Make PODIO_GENERATE_DICTIONARY a thin wrapper around REFLEX_GENERATE_DICTIONARY (#807)

* Replace the re-implementation with a call to the original

* Remove overlength-strings warning again

Author: tmadlener

cmake/podioMacros.cmake

@@ -5,100 +5,22 @@
 # if dictionary is a TARGET (e.g., created with add_library), we inherit the INCLUDE_DIRECTORES and
 # COMPILE_DEFINITIONS properties
 #
-# This is a copy from REFLEX_GENERATE_DICTIONARY from the RootMacros in Root v6.22
-# Copied here to allow creating dictionaries based on target properties
-#---------------------------------------------------------------------------------------------------
+# This is effectively a wrapper around REFLEX_GENERATE_DICTIONARY from the RootMacros.
+#
+# Originally this was a re-implementation / backporting of that to deal with
+# oler ROOT versions, but since we now depend on a newer ROOT version in any
+# case we keep this to not break the CMake API of podio.
+# ---------------------------------------------------------------------------------------------------
 function(PODIO_GENERATE_DICTIONARY dictionary)
-  CMAKE_PARSE_ARGUMENTS(ARG "" "SELECTION" "OPTIONS;DEPENDS" ${ARGN})
-  #---Get List of header files---------------
-  set(headerfiles)
-  foreach(fp ${ARG_UNPARSED_ARGUMENTS})
-    file(GLOB files inc/${fp})
-    if(files)
-      foreach(f ${files})
-        if(NOT f MATCHES LinkDef)
-          set(headerfiles ${headerfiles} ${f})
-        endif()
-      endforeach()
-    elseif(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${fp})
-      set(headerfiles ${headerfiles} ${CMAKE_CURRENT_SOURCE_DIR}/${fp})
-    else()
-      set(headerfiles ${headerfiles} ${fp})
-    endif()
-  endforeach()
-  #---Get Selection file------------------------------------
-  if(IS_ABSOLUTE ${ARG_SELECTION})
-    set(selectionfile ${ARG_SELECTION})
-  else()
-    set(selectionfile ${CMAKE_CURRENT_SOURCE_DIR}/${ARG_SELECTION})
-  endif()
-
-  set(gensrcdict ${dictionary}.cxx)
+  REFLEX_GENERATE_DICTIONARY(${ARGV})
 
-  #---roottest compability---------------------------------
-  if(CMAKE_ROOTTEST_NOROOTMAP)
-    set(rootmapname )
-    set(rootmapopts )
-  elseif(DEFINED CMAKE_ROOTTEST_NOROOTMAP)  # Follow the roottest dictionary library naming
-    set(rootmapname ${dictionary}.rootmap)
-    set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}_dictrflx)
-  else()
-    set(rootmapname ${dictionary}Dict.rootmap)
-    set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}Dict)
-  endif()
-
-  set(include_dirs ${CMAKE_CURRENT_SOURCE_DIR})
-  get_directory_property(incdirs INCLUDE_DIRECTORIES)
-  foreach(d ${incdirs})
-    if(NOT "${d}" MATCHES "^(AFTER|BEFORE|INTERFACE|PRIVATE|PUBLIC|SYSTEM)$")
-      list(APPEND include_dirs ${d})
-    endif()
-  endforeach()
-
-  get_directory_property(defs COMPILE_DEFINITIONS)
-  foreach( d ${defs})
-   list(APPEND definitions ${d})
-  endforeach()
-
-  IF(TARGET ${dictionary})
-    LIST(APPEND include_dirs $<TARGET_PROPERTY:${dictionary},INCLUDE_DIRECTORIES>)
-    LIST(APPEND definitions $<TARGET_PROPERTY:${dictionary},COMPILE_DEFINITIONS>)
-  ENDIF()
-
-  add_custom_command(
-    OUTPUT ${gensrcdict} ${rootmapname}
-    COMMAND ${ROOT_genreflex_CMD}
-    ARGS ${headerfiles} -o ${gensrcdict} ${rootmapopts} --select=${selectionfile}
-         --gccxmlpath=${GCCXML_home}/bin ${ARG_OPTIONS}
-         "-I$<JOIN:${include_dirs},;-I>"
-         "$<$<BOOL:$<JOIN:${definitions},>>:-D$<JOIN:${definitions},;-D>>"
-    DEPENDS ${headerfiles} ${selectionfile} ${ARG_DEPENDS}
-
-    COMMAND_EXPAND_LISTS
-    )
-  IF(TARGET ${dictionary})
-    target_sources(${dictionary} PRIVATE ${gensrcdict})
-  ENDIF()
-  set(gensrcdict ${dictionary}.cxx PARENT_SCOPE)
+  # Dictionary payloads become very large for our generated EDMs, so we
+  # explicitly silence this warning here.
   set_source_files_properties(${gensrcdict}
     PROPERTIES
     GENERATED TRUE
     COMPILE_FLAGS "-Wno-overlength-strings"
-    )
-
-  #---roottest compability---------------------------------
-  if(CMAKE_ROOTTEST_DICT)
-    ROOTTEST_TARGETNAME_FROM_FILE(targetname ${dictionary})
-
-    set(targetname "${targetname}-dictgen")
-
-    add_custom_target(${targetname} DEPENDS ${gensrcdict} ${ROOT_LIBRARIES})
-  else()
-    set(targetname "${dictionary}-dictgen")
-    # Creating this target at ALL level enables the possibility to generate dictionaries (genreflex step)
-    # well before the dependent libraries of the dictionary are build
-    add_custom_target(${targetname} ALL DEPENDS ${gensrcdict})
-  endif()
+  )
 
   # We are not going to be able to fix these in any case, so disable clang-tidy
   # for the generated dictionaries