Skip to content

[CMake] Fix dictionary depfile target under CMP0116 OLD #23010

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

Closed
guitargeek wants to merge 1 commit into from
Closed

[CMake] Fix dictionary depfile target under CMP0116 OLD #23010

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
5 changes: 5 additions & 0 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,10 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
endif()

#---call rootcling------------------------------------------
# use CMP0116 NEW locally so CMake normalises the depfile
# target for the active generator regardless of the global OLD setting.
cmake_policy(PUSH)
cmake_policy(SET CMP0116 NEW)
add_custom_command(
OUTPUT ${dictionary}.cxx ${pcm_name} ${rootmap_name} ${cpp_module_file}
COMMAND ${command} -v2 -f ${dictionary}.cxx ${newargs} ${excludepathsargs} ${rootmapargs}
Expand All @@ -750,6 +754,7 @@ function(ROOT_GENERATE_DICTIONARY dictionary)
${cxx_std_stamp}
COMMAND_EXPAND_LISTS
)
cmake_policy(POP)

# If we are adding to an existing target and it's not the dictionary itself,
# we make an object library and add its output object file as source to the target.
Expand Down
Loading