Skip to content

Commit 2cfe20f

Browse files
committed
Move rootcling dictionary options after include directories
If ${ARG_OPTIONS} is used to propagate extra include directories to rootcling and the extra directories contain another ROOT installation, then ROOT headers will come from the external ROOT and break the build. We need to make sure that headers from the current build take precedence over any external installation of ROOT by moving definitions and include directories towards the beginning of the command line for rootcling.
1 parent 73f8451 commit 2cfe20f

File tree

1 file changed

+1
-1
lines changed

1 file changed

+1
-1
lines changed

cmake/modules/RootNewMacros.cmake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -421,7 +421,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
421421
#---call rootcint------------------------------------------
422422
add_custom_command(OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name} ${cpp_module_file}
423423
COMMAND ${command} -v2 -f ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
424-
${ARG_OPTIONS} ${definitions} ${includedirs} ${headerfiles} ${_linkdef}
424+
${definitions} ${includedirs} ${ARG_OPTIONS} ${headerfiles} ${_linkdef}
425425
IMPLICIT_DEPENDS ${_implicitdeps}
426426
DEPENDS ${_list_of_header_dependencies} ${_linkdef} ${ROOTCINTDEP} ${ARG_DEPENDENCIES})
427427
get_filename_component(dictname ${dictionary} NAME)

0 commit comments

Comments
 (0)