Skip to content

[main,misc,mc,bindings] add headers to file_sets #23984

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 4 commits into
base: master
Choose a base branch
from
Open

[main,misc,mc,bindings] add headers to file_sets #23984

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9b86e21
[main] add headers to file_sets in interface target
ferdymercury Nov 4, 2026
e8a42c8
[montecarlo] add headers to private file_sets
ferdymercury Nov 4, 2026
e75dac9
[misc] add headers to private file_sets
ferdymercury Nov 4, 2026
9774db2
[bindings] add headers to private file_sets
ferdymercury Nov 4, 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
23 changes: 20 additions & 3 deletions bindings/tpython/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,11 +8,16 @@
# CMakeLists.txt file for building TPython
###########################################################

set(TPYTHON_HEADERS
TPyArg.h
TPyClassGenerator.h
TPyReturn.h
TPython.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTPython
HEADERS
TPyArg.h
TPyReturn.h
TPython.h
${TPYTHON_HEADERS}
SOURCES
src/TPyArg.cxx
src/TPyClassGenerator.cxx
Expand All @@ -30,6 +35,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(ROOTTPython
Python3::Python
)

set(RELATIVE_INC_HEADERS ${TPYTHON_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(ROOTTPython
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)

# On Windows we can't use the stable ABI yet: it requires linking against a
# different libpython, so as long as we don't build all translation units in
# the ROOT Pythonization library with the stable ABI we should not use it.
Expand Down
23 changes: 18 additions & 5 deletions main/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,20 +142,33 @@ endif()
add_dependencies(genreflex rootcling)
add_dependencies(rootcint rootcint)

add_library(rootexecutableHelpers INTERFACE)
target_sources(rootexecutableHelpers
PUBLIC
FILE_SET HEADERS
TYPE HEADERS
BASE_DIRS src/
FILES
src/RootObjTree.hxx
src/RootObjTree.cxx
src/logging.hxx
src/wildcards.hpp
)

if (TARGET Gui)
ROOT_EXECUTABLE(rootbrowse src/rootbrowse.cxx LIBRARIES RIO Core Rint Gui)
ROOT_EXECUTABLE(rootbrowse src/rootbrowse.cxx LIBRARIES RIO Core Rint Gui rootexecutableHelpers)
target_include_directories(rootbrowse PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc)
endif()

ROOT_EXECUTABLE(rootcp src/rootcp.cxx LIBRARIES RIO Tree Core Rint)
ROOT_EXECUTABLE(rootcp src/rootcp.cxx LIBRARIES RIO Tree Core Rint rootexecutableHelpers)
target_include_directories(rootcp PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc)

ROOT_EXECUTABLE(rootls src/rootls.cxx LIBRARIES RIO Tree Core Rint ROOTNTuple)
ROOT_EXECUTABLE(rootls src/rootls.cxx LIBRARIES RIO Tree Core Rint ROOTNTuple rootexecutableHelpers)
target_include_directories(rootls PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc)

ROOT_EXECUTABLE(rootmkdir src/rootmkdir.cxx LIBRARIES RIO Core Rint)
ROOT_EXECUTABLE(rootmkdir src/rootmkdir.cxx LIBRARIES RIO Core Rint rootexecutableHelpers)
target_include_directories(rootmkdir PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc)

ROOT_EXECUTABLE(rootrm src/rootrm.cxx LIBRARIES RIO Core Rint)
ROOT_EXECUTABLE(rootrm src/rootrm.cxx LIBRARIES RIO Core Rint rootexecutableHelpers)
target_include_directories(rootrm PRIVATE ${CMAKE_SOURCE_DIR}/core/utils/inc)

12 changes: 12 additions & 0 deletions misc/rmkdepend/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,15 @@ ROOT_EXECUTABLE(rmkdepend
parse.c
pr.c
)

target_sources(rmkdepend
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS ./
FILES
def.h
ifparser.h
imakemdep.h
)

38 changes: 28 additions & 10 deletions montecarlo/eg/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,22 @@
# @author Pere Mato, CERN
############################################################################

set(EG_HEADERS
TAttParticle.h
TDatabasePDG.h
TDecayChannel.h
TGenerator.h
TPDGCode.h
TParticleClassPDG.h
TParticle.h
TParticlePDG.h
TPrimary.h
TVirtualMCDecayer.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(EG
HEADERS
TAttParticle.h
TDatabasePDG.h
TDecayChannel.h
TGenerator.h
TPDGCode.h
TParticleClassPDG.h
TParticle.h
TParticlePDG.h
TPrimary.h
TVirtualMCDecayer.h
${EG_HEADERS}
SOURCES
src/TAttParticle.cxx
src/TDatabasePDG.cxx
Expand All @@ -41,4 +45,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(EG
ROOTX3dViewer
)

set(RELATIVE_INC_HEADERS ${EG_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(EG
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
inc/Hepevt.h
inc/cfortran.h
)

ROOT_ADD_TEST_SUBDIRECTORY(test)
20 changes: 18 additions & 2 deletions montecarlo/pythia8/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,14 @@
# required also for cling
include_directories(${PYTHIA8_INCLUDE_DIR})

set(EGPYTHIA8_HEADERS
TPythia8.h
TPythia8Decayer.h
)

ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia8
HEADERS
TPythia8.h
TPythia8Decayer.h
${EGPYTHIA8_HEADERS}
SOURCES
src/TPythia8.cxx
src/TPythia8Decayer.cxx
Expand All @@ -26,6 +30,18 @@ ROOT_STANDARD_LIBRARY_PACKAGE(EGPythia8
Physics
)

set(RELATIVE_INC_HEADERS ${EGPYTHIA8_HEADERS})
list(TRANSFORM RELATIVE_INC_HEADERS PREPEND inc/)
target_sources(EGPythia8
PRIVATE
FILE_SET private_header_files
TYPE HEADERS
BASE_DIRS inc/
FILES
${RELATIVE_INC_HEADERS}
inc/LinkDef.h
)

ROOT_ADD_CXX_FLAG(_EGPythia8_FLAGS -Wno-delete-non-virtual-dtor)
ROOT_ADD_CXX_FLAG(_EGPythia8_FLAGS -Wno-misleading-indentation)
ROOT_ADD_CXX_FLAG(_EGPythia8_FLAGS -Wno-overloaded-virtual)
Expand Down
Loading