dd4hep_add_dictionary: use completely REMOVE_DUPLICATES genex (availa…

…ble since cmake 3.15)
AIDASoft · Mar 12, 2024 · f5b3fb9 · f5b3fb9
1 parent 7668417
commit f5b3fb9
Showing 1 changed file with 3 additions and 4 deletions.
diff --git a/cmake/DD4hepBuild.cmake b/cmake/DD4hepBuild.cmake
@@ -598,8 +598,7 @@ function(dd4hep_add_dictionary dictionary )
   )
   if(ARG_TARGET)
     file(GENERATE OUTPUT create_${dictionary}_$<CONFIG>$<COMPILE_LANGUAGE>.sh
-      CONTENT "${ROOT_rootcling_CMD} -f ${dictionary}.cxx -s ${output_dir}/${dictionary} -inlineInputHeader ${ARG_OPTIONS} $<$<BOOL:$<JOIN:${comp_defs},>>:-D$<JOIN:${comp_defs},;-D>> $<$<BOOL:$<JOIN:${inc_dirs},>>:-I$<JOIN:${inc_dirs},;-I>> $<JOIN:${headers},;> $<JOIN:${linkdefs},;>"
-      TARGET ${ARG_TARGET}
+      CONTENT "${ROOT_rootcling_CMD} -f ${dictionary}.cxx -s ${output_dir}/${dictionary} -inlineInputHeader ${ARG_OPTIONS} $<$<BOOL:$<JOIN:${comp_defs},>>:-D$<JOIN:$<REMOVE_DUPLICATES:${comp_defs}>,;-D>> $<$<BOOL:$<JOIN:${inc_dirs},>>:-I$<JOIN:$<REMOVE_DUPLICATES:${inc_dirs}>,;-I>> $<JOIN:${headers},;> $<JOIN:${linkdefs},;>"
     )
     add_custom_command(OUTPUT fixed_create_${dictionary}_$<CONFIG>CXX.sh
       COMMAND sed "s/\;/ /g" create_${dictionary}_$<CONFIG>CXX.sh > fixed_create_${dictionary}_$<CONFIG>CXX.sh
@@ -615,8 +614,8 @@ function(dd4hep_add_dictionary dictionary )
       COMMAND ${ROOT_rootcling_CMD}
       ARGS -f ${dictionary}.cxx -s ${output_dir}/${dictionary} -inlineInputHeader
       ${ARG_OPTIONS}
-      "$<$<BOOL:$<JOIN:${comp_defs},>>:-D$<JOIN:${comp_defs},;-D>>"
-      "$<$<BOOL:$<JOIN:${inc_dirs},>>:-I$<JOIN:${inc_dirs},;-I>>"
+      "$<$<BOOL:$<JOIN:${comp_defs},>>:-D$<JOIN:$<REMOVE_DUPLICATES:${comp_defs}>,;-D>>"
+      "$<$<BOOL:$<JOIN:${inc_dirs},>>:-I$<JOIN:$<REMOVE_DUPLICATES:${inc_dirs}>,;-I>>"
       "$<JOIN:${headers},;>" "$<JOIN:${linkdefs},;>"
 
       DEPENDS ${headers} ${linkdefs}