Skip to content

[CMake] Fix compile definitions being passed to rootcling as -D-Dxxx. #19030

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.

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

Merged
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
11 changes: 11 additions & 0 deletions cmake/modules/SearchInstalledSoftware.cmake
Original file line number Diff line number Diff line change
Expand Up @@ -968,6 +968,17 @@ if(xrootd AND NOT builtin_xrootd)
endif()
endif()
endif()

if(XRootD_VERSION VERSION_LESS 5.8.4)
# Remove -D from XRootD's exported compile definitions. https://github.com/xrootd/xrootd/issues/2543
foreach(XRDTarget XRootD::XrdCl XRootD::XrdUtils)
if(TARGET ${XRDTarget})
get_target_property(PROP ${XRDTarget} INTERFACE_COMPILE_DEFINITIONS)
list(TRANSFORM PROP REPLACE "^-D" "")
set_property(TARGET ${XRDTarget} PROPERTY INTERFACE_COMPILE_DEFINITIONS ${PROP})
endif()
endforeach()
endif()
endif()

if(builtin_xrootd)
Expand Down
Loading