Skip to content
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

Jump to bottom

ROOT: Use rootcling instead of genreflex for root dict generation #8984

Merged
merged 1 commit into from
Feb 6, 2024
Merged

ROOT: Use rootcling instead of genreflex for root dict generation #8984

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion scram-project-build.file
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ BuildRequires: dwz
%endif

%if "%{?configtag:set}" != "set"
%define configtag V09-02-03
%define configtag V09-02-04
%endif

%if "%{?buildarch:set}" != "set"
Expand Down
5 changes: 0 additions & 5 deletions scram-tools.file/tools/root/env.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,3 @@
ROOT_GX11_LIB=GX11
[ $(uname -s) = "Darwin" ] && ROOT_GX11_LIB=GCocoa
export ROOT_GX11_LIB

export GENREFLEX_FAILES_ON_WARNS=--fail_on_warnings
if [ "$ROOT_CXXMODULES" = "1" ] ; then
export GENREFLEX_FAILES_ON_WARNS=-failOnWarnings
fi
2 changes: 1 addition & 1 deletion scram-tools.file/tools/root/root.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<tool name="root" version="@TOOL_VERSION@">
<info url="http://root.cern.ch/root/"/>
<use name="rootphysics"/>
<flags GENREFLEX_FAILES_ON_WARNS="@GENREFLEX_FAILES_ON_WARNS@"/>
<flags GENREFLEX_FAILES_ON_WARNS="-failOnWarnings"/>
<flags CXXMODULES="@ROOT_CXXMODULES@"/>
</tool>
2 changes: 1 addition & 1 deletion scram-tools.file/tools/root/rootrflx.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
<flags GENREFLEX_GCCXMLOPT="-m64"/>
</ifarchitecture>
<flags GENREFLEX_CPPFLAGS="-DCMS_DICT_IMPL -D_REENTRANT -DGNUSOURCE -D__STRICT_ANSI__"/>
<runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/genreflex"/>
<runtime name="GENREFLEX" value="$ROOTRFLX_BASE/bin/rootcling"/>
<flags OVERRIDABLE_FLAGS="GENREFLEX_CPPFLAGS"/>
<use name="root_interface"/>
<use name="rootcling"/>
Expand Down