Skip to content

Including headers for all libraries based on ROOT_STANDARD_LIBRARY_PACKAGE #6014

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
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Including headers for all libraries based on ROOT_STANDARD_LIBRARY_PACKAGE #6014

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
10 changes: 10 additions & 0 deletions cmake/modules/RootMacros.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1242,6 +1242,16 @@ function(ROOT_STANDARD_LIBRARY_PACKAGE libname)
endif()
endif()

foreach (h ${ARG_HEADERS})
if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/inc/${h}")
list(APPEND ARG_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/inc/${h}")
elseif (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/v7/inc/${h}")
list(APPEND ARG_SOURCES "${CMAKE_CURRENT_SOURCE_DIR}/v7/inc/${h}")
else()
message("Could not find directory of header file: ${h}")
endif()
endforeach()
Copy link
Member

Choose a reason for hiding this comment

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

Have a look at ROOT_GENERATE_DICTIONARY for the logic to check if the header exists, it may make sense to something similar here or split that search logic into its own macro or function. ARG_HEADERS may actually contain more than just the headers for a given target, so I'm not sure we can use it verbatim to add headers to the targets. It should be ok if all targets use NODEPHEADERS properly, but it's probably worth checking anyway.

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I had a look and the logic seems overly complex to me. I would like to keep it simple. I improved the message in case the header is not found and on the current master, it is never triggered. Therefore this logic seems to suffice.

Copy link
Member

Choose a reason for hiding this comment

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

Shouldn't we explicitly enumerate all sources when calling ROOT_STANDARD_LIBRARY_PACKAGE nowadays?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

YES! But people seem to have a different understanding of what a source is. In ROOT it seems people just add sources that need to be compiled. IMO at least all files containing code should be added.

For ROOT, that's a rather big change. I can try to do that for the libraries I will be working with, but I would like to have more support to move in this direction. Maybe we should discuss this in a team meeting.


if (ARG_OBJECT_LIBRARY)
ROOT_OBJECT_LIBRARY(${libname}Objs ${ARG_SOURCES}
$<$<BOOL:${ARG_NO_SOURCES}>:dummy.cxx>)
Expand Down
Loading