Use rootcling -m option to avoid duplicates in dictionaries

davidrohr · davidrohr · commit d4567f712701 · 2020-10-01T09:57:44.000+02:00
diff --git a/cmake/AddRootDictionary.cmake b/cmake/AddRootDictionary.cmake
@@ -144,6 +144,7 @@ function(add_root_dictionary target)
       --include_dirs -I$<JOIN:${includeDirs},$<SEMICOLON>-I>
       $<$<BOOL:${prop}>:--compile_defs>
       $<$<BOOL:${prop}>:-D$<JOIN:${prop},$<SEMICOLON>-D>>
+      --pcmdeps "$<REMOVE_DUPLICATES:${list_pcm_deps_${target}}>"
       --headers "${headers}"
     COMMAND
     ${CMAKE_COMMAND} -E copy_if_different ${CMAKE_CURRENT_BINARY_DIR}/${pcmBase} ${pcmFile}
diff --git a/cmake/rootcling_wrapper.sh.in b/cmake/rootcling_wrapper.sh.in
@@ -37,6 +37,10 @@ while [[ $# -gt 0 ]]; do
     ROOTMAP_FILE="$2"
     shift 2
     ;;
+  --pcmdeps)
+    PCMDEPS="$2"
+    shift 2
+    ;;
   *)
     if [[ -z "$1" ]]; then
       shift
@@ -77,7 +81,14 @@ LOGFILE=${DICTIONARY_FILE}.log
   -rml ${ROOTMAP_LIBRARY_NAME} \
   ${INCLUDE_DIRS//;/ } \
   ${COMPILE_DEFINITIONS//;/ } \
-  ${HEADERS//;/ } > ${LOGFILE} 2>&1 || cat ${LOGFILE} >&2
+  ${PCMDEPS:+-m }${PCMDEPS//;/ -m } \
+  ${HEADERS//;/ } \
+  > ${LOGFILE} 2>&1 || cat ${LOGFILE} >&2
+
+if [[ $? != "0" ]]; then
+  rm $DICTIONARY_FILE
+  exit 1
+fi
 
 MSG="Warning: Unused class rule"
 if [[ -s ${LOGFILE} ]]; then
