Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
19 changes: 7 additions & 12 deletions cmake/modules/RootMacros.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -623,22 +623,17 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
#---Get the library and module dependencies-----------------
if(ARG_DEPENDENCIES)
foreach(dep ${ARG_DEPENDENCIES})
if(NOT TARGET G__${dep})
# This is a library that doesn't come with dictionary/pcm
continue()
endif()

# Whether <dep> provides a dictionary/pcm is decided at generation time
# via $<TARGET_EXISTS:G__<dep>>, so the '-m' flag and the module-file
# dependency below are independent of configuration order and expand to
# nothing for a dictionary-less library.
set(dep_has_dict "$<TARGET_EXISTS:G__${dep}>")
set(dependent_pcm ${libprefix}${dep}_rdict.pcm)
if (runtime_cxxmodules AND NOT dep IN_LIST local_no_cxxmodules)
set(dependent_pcm ${dep}.pcm)
if(TARGET ${dep})
get_target_property(_dep_pcm_filename ${dep} ROOT_PCM_FILENAME)
if(_dep_pcm_filename)
list(APPEND pcm_dependencies ${_dep_pcm_filename})
endif()
endif()
list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
endif()
set(newargs ${newargs} -m ${dependent_pcm})
set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
Comment thread
guitargeek marked this conversation as resolved.
endforeach()
endif()

Expand Down
Loading