Skip to content

[cmake] Make explicit that all dictionaries depend on Core.pcm #23207

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ferdymercury wants to merge 7 commits into
base: master
Choose a base branch
from
+18 −15
Open

[cmake] Make explicit that all dictionaries depend on Core.pcm #23207

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
a674c2c
[cmake] Make explicit that all dictionaries depends on Core.pcm
ferdymercury Aug 31, 2026
501a7c6
[nfc] stray newline
ferdymercury Aug 31, 2026
8493d69
[cmake] avoid circular dependency
ferdymercury Aug 31, 2026
58fc8be
[cmake] fix placement
ferdymercury Aug 31, 2026
0fbdad7
remnant
ferdymercury Aug 31, 2026
46f9bab
Update cmake/modules/RootMacros.cmake
ferdymercury Aug 31, 2026
9e39f7f
Apply suggestion from @ferdymercury
ferdymercury Aug 31, 2026
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
33 changes: 18 additions & 15 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,21 +621,24 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
endif()

#---Get the library and module dependencies-----------------
if(ARG_DEPENDENCIES)
foreach(dep ${ARG_DEPENDENCIES})
# 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)
list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
endif()
set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
endforeach()
endif()
# Every dictionary implicitly depends on Core's pcm, except the one for Core itself.
if(ARG_MODULE AND NOT ARG_MODULE STREQUAL "Core")
list(INSERT ARG_DEPENDENCIES 0 Core)
list(REMOVE_DUPLICATES ARG_DEPENDENCIES)
endif()
foreach(dep ${ARG_DEPENDENCIES})
# Whether <dep> provides a dictionary/pcm is decided at generation time
Comment on lines +625 to +630

@hageboeck hageboeck Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I liked your first attempt to put Core in the for loop:

Suggested change
if(ARG_MODULE AND NOT ARG_MODULE STREQUAL "Core")
list(INSERT ARG_DEPENDENCIES 0 Core)
list(REMOVE_DUPLICATES ARG_DEPENDENCIES)
endif()
foreach(dep ${ARG_DEPENDENCIES})
# Whether <dep> provides a dictionary/pcm is decided at generation time
foreach(dep Core ${ARG_DEPENDENCIES})
if(dep STREQUAL ARG_MODULE)
continue() # Don't depend on self
endif()
# Whether <dep> provides a dictionary/pcm is decided at generation time

I think this should work because ${dep} will be compared to "ARG_MODULE" if the latter is not a variable.

@ferdymercury ferdymercury Sep 1, 2026 •
edited
Loading

Copy link
Copy Markdown
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The drawback of this is that there might be already Core in ARG_DEPENDENCIES so we would pass twice for it in the loop

@pcanal pcanal Sep 1, 2026

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I liked your first attempt to put Core in the for loop:

Then it gets added for Core it self and that can not work.

# 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)
list(APPEND pcm_dependencies "$<${dep_has_dict}:$<TARGET_PROPERTY:${dep},ROOT_PCM_FILENAME>>")
endif()
set(newargs ${newargs} "$<${dep_has_dict}:-m>" "$<${dep_has_dict}:${dependent_pcm}>")
endforeach()

if(cpp_module_file)
set(newargs -cxxmodule ${newargs})
Expand Down
Loading