Skip to content

[ntuple] Add missing headers to CMakeLists #23242

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

[ntuple] Add missing headers to CMakeLists #23242

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c88b5f
[ntuple] Add missing header to module and install set.
hageboeck Sep 3, 2026
b80166c
[ntuple] Pass optional headers to CMake macro.
hageboeck Sep 2, 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
20 changes: 15 additions & 5 deletions tree/ntuple/CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@
# RNTuple optionally writes to S3-compatible object storage via libcurl (RCurlHttp).
if(curl)
set(ROOTNTuple_OPTIONAL_DEPENDENCIES RCurlHttp)
list(APPEND ROOTNTuple_EXTRA_HEADERS ROOT/RPageStorageS3.hxx)
list(APPEND ROOTNTuple_EXTRA_SOURCES src/RPageStorageS3.cxx)
endif()

# Enable RNTuple support for Intel DAOS
if(daos OR daos_mock)
list(APPEND ROOTNTuple_EXTRA_HEADERS ROOT/RPageStorageDaos.hxx)
list(APPEND ROOTNTuple_EXTRA_SOURCES src/RDaos.cxx src/RPageStorageDaos.cxx)

if(daos_mock)
list(APPEND ROOTNTuple_EXTRA_SOURCES src/libdaos_mock/libdaos_mock.cxx)
endif()
endif()

ROOT_STANDARD_LIBRARY_PACKAGE(ROOTNTuple
Expand All @@ -20,6 +32,7 @@ HEADERS
ROOT/RClusterPool.hxx
ROOT/RColumn.hxx
ROOT/RColumnElementBase.hxx
ROOT/RCreateFieldOptions.hxx
ROOT/REntry.hxx
ROOT/RField.hxx
ROOT/RFieldBase.hxx
Expand Down Expand Up @@ -61,6 +74,7 @@ HEADERS
ROOT/RPageStorage.hxx
ROOT/RPageStorageFile.hxx
ROOT/RRawPtrWriteEntry.hxx
${ROOTNTuple_EXTRA_HEADERS}
SOURCES
src/RCluster.cxx
src/RClusterPool.cxx
Expand Down Expand Up @@ -99,6 +113,7 @@ SOURCES
src/RPageSinkBuf.cxx
src/RPageStorage.cxx
src/RPageStorageFile.cxx
${ROOTNTuple_EXTRA_SOURCES}
LINKDEF
LinkDef.h
DEPENDENCIES
Expand All @@ -112,15 +127,12 @@ target_link_libraries(ROOTNTuple PRIVATE xxHash::xxHash)

# Enable RNTuple support for Intel DAOS
if(daos OR daos_mock)
set(ROOTNTuple_EXTRA_HEADERS ROOT/RPageStorageDaos.hxx)
target_sources(ROOTNTuple PRIVATE src/RDaos.cxx src/RPageStorageDaos.cxx)
target_compile_definitions(ROOTNTuple PRIVATE R__ENABLE_DAOS)

target_include_directories(ROOTNTuple PRIVATE ${UUID_INCLUDE_DIR})
target_link_libraries(ROOTNTuple PRIVATE ${UUID_LIBRARY})
if(daos_mock)
target_include_directories(ROOTNTuple PRIVATE inc/ROOT/libdaos_mock/)
target_sources(ROOTNTuple PRIVATE src/libdaos_mock/libdaos_mock.cxx)
else()
target_include_directories(ROOTNTuple PRIVATE ${DAOS_INCLUDE_DIRS})
target_link_libraries(ROOTNTuple PRIVATE ${DAOS_LIBRARIES})
Expand All @@ -129,8 +141,6 @@ endif()

# Enable RNTuple support for S3-compatible object storage
if(curl)
set(ROOTNTuple_EXTRA_HEADERS ${ROOTNTuple_EXTRA_HEADERS} ROOT/RPageStorageS3.hxx)
target_sources(ROOTNTuple PRIVATE src/RPageStorageS3.cxx)
target_compile_definitions(ROOTNTuple PRIVATE R__ENABLE_S3)
target_link_libraries(ROOTNTuple PRIVATE nlohmann_json::nlohmann_json)
endif()
Expand Down
Loading