Skip to content

Commit b44608a

Browse files
authored
Re-enable RNTuple support for ROOT 6.32 (#768)
* Re-enable RNTuple support for ROOT 6.32 * Enable CI with RNTuple support for Key4hep again * Re-enable RNTuple support for pre-commit
1 parent 6b2484b commit b44608a

File tree

3 files changed

+7
-3
lines changed

3 files changed

+7
-3
lines changed

.github/workflows/key4hep.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ jobs:
4343
-DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror -Wno-error=deprecated-declarations " \
4444
-DCMAKE_CXX_COMPILER_LAUNCHER=ccache \
4545
-DUSE_EXTERNAL_CATCH2=AUTO \
46-
-DENABLE_RNTUPLE=OFF \
46+
-DENABLE_RNTUPLE=ON \
4747
-DENABLE_DATASOURCE=ON \
4848
-G Ninja ..
4949
echo "::endgroup::"

.github/workflows/pre-commit.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ jobs:
3535
cd build
3636
cmake .. -DENABLE_SIO=ON \
3737
-DENABLE_JULIA=ON \
38-
-DENABLE_RNTUPLE=OFF \
38+
-DENABLE_RNTUPLE=ON \
3939
-DENABLE_DATASOURCE=ON \
4040
-DCMAKE_CXX_STANDARD=20 \
4141
-DCMAKE_CXX_FLAGS=" -fdiagnostics-color=always -Werror "\

CMakeLists.txt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -81,13 +81,17 @@ set(root_components_needed RIO Tree)
8181
set(root_min_version 6.28.04)
8282
if(ENABLE_RNTUPLE)
8383
list(APPEND root_components_needed ROOTNTuple)
84-
set(root_min_version 6.34)
84+
set(root_min_version 6.32)
8585
endif()
8686
if(ENABLE_DATASOURCE)
8787
list(APPEND root_components_needed ROOTDataFrame)
8888
endif()
8989
find_package(ROOT ${root_min_version} REQUIRED COMPONENTS ${root_components_needed})
9090

91+
if(ENABLE_RNTUPLE AND ROOT_VERSION VERSION_LESS 6.34)
92+
message(WARNING "You are building RNTuple support against a version of ROOT that does not yet guarantee RNTuple backwards compatibility")
93+
endif()
94+
9195
# ROOT_CXX_STANDARD was introduced in https://github.com/root-project/root/pull/6466
9296
# before that it's an empty variable so we check if it's any number > 0
9397
if(NOT DEFINED ROOT_CXX_STANDARD)

0 commit comments

Comments
 (0)