Skip to content

Replace genreflex in favor of rootcling #379

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

Replace genreflex in favor of rootcling #379

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
6782156
Replaced genreflex with rootcling
imorlxs Jul 11, 2024
3e0ff0a
Added solution from FairROOT/#385
imorlxs Jul 17, 2024
697e34b
Get rid of genreflex instances
imorlxs Jul 24, 2024
f46f12c
Remove -cxxmodule flag
imorlxs Jul 24, 2024
356f21e
Remove LAUNCHER invocation
imorlxs Jul 27, 2024
bc0fcdc
Add -f flag to overwrite files
imorlxs Jul 27, 2024
2e0af1c
Removed double minus to keep the code clean
imorlxs Jul 27, 2024
0fbb667
Fix whitespace changes
imorlxs Aug 5, 2024
eb2ea69
Remove --select from bdm-code-generation
imorlxs Aug 5, 2024
c33f105
Remove trim whitespaces
imorlxs Aug 7, 2024
33c3c30
Changed rootcling calls to be the same
imorlxs Aug 7, 2024
3e1572c
Update .editorconfig
imorlxs Aug 20, 2024
054caff
Add --v2 flag to show warnings
imorlxs Aug 23, 2024
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 cmake/BioDynaMo.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ function(build_shared_library TARGET)
# We always need dictionaries for the plugins (plugin manager requires class
# information)
if(dict OR DEFINED ARG_PLUGIN)
# generate dictionary using genreflex
# generate dictionary using rootcling reflex
set(DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_dict")
set(BDM_DICT_FILE "${CMAKE_CURRENT_BINARY_DIR}/lib${TARGET}_bdm_dict.cc")

Expand Down
4 changes: 1 addition & 3 deletions cmake/FindROOT.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -97,8 +97,6 @@ mark_as_advanced(ROOT_CONFIG_EXECUTABLE)
include(CMakeParseArguments)
find_program(ROOTCLING_EXECUTABLE rootcling
HINTS "$ENV{ROOTSYS}/bin" "$ENV{BDM_ROOT_DIR}/bin" "${CMAKE_THIRD_PARTY_DIR}/root/bin")
find_program(GENREFLEX_EXECUTABLE genreflex
HINTS "$ENV{ROOTSYS}/bin" "$ENV{BDM_ROOT_DIR}/bin" "${CMAKE_THIRD_PARTY_DIR}/root/bin")
#find_package(GCCXML)

# We use the launcher script to emulate a `source thisbdm.sh` call
Expand Down Expand Up @@ -198,7 +196,7 @@ function(REFLEX_GENERATE_DICTIONARY dictionary)
#set(rootmapopts --rootmap=${rootmapname} --rootmap-lib=${libprefix}${dictionary}Dict)
#---Actual command----------------------------------------
add_custom_command(OUTPUT ${gensrcdict} ${rootmapname} ${dictionary}_rdict.pcm
COMMAND ${LAUNCHER} ${GENREFLEX_EXECUTABLE} ${headerfiles} -o ${gensrcdict} ${rootmapopts} --select=${selectionfile} --noIncludePaths
COMMAND ${ROOTCLING_EXECUTABLE} --reflex --v2 -f ${gensrcdict} ${rootmapopts} ${headerfiles} ${selectionfile} --noIncludePaths --inlineInputHeader
${ARG_OPTIONS} ${includedirs} ${definitions}
DEPENDS ${headerfiles} ${selectionfile})
endfunction()
1 change: 0 additions & 1 deletion cmake/utils.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,6 @@ function(verify_ROOT)
SET(ROOT_ETC_DIR ${ROOT_ETC_DIR} PARENT_SCOPE)
SET(ROOT_CONFIG_EXECUTABLE ${ROOT_CONFIG_EXECUTABLE} PARENT_SCOPE)
SET(ROOTCLING_EXECUTABLE ${ROOTCLING_EXECUTABLE} PARENT_SCOPE)
SET(GENREFLEX_EXECUTABLE ${GENREFLEX_EXECUTABLE} PARENT_SCOPE)
else()
# When ROOT is found, but it's not C++17 compliant, we exit the installation, because ROOT needs
# to be properly sourced prior to invoking CMake (CMake cannot do this for us, because it requires
Expand Down
2 changes: 1 addition & 1 deletion util/makefile-build/bdm-code-generation
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ CXX_INCLUDES=$(${BDM_CONFIG} --cxxincludes | sed 's|-isystem |-I|g')

CXX_DEFINES=$(${BDM_CONFIG} --cxxdefines)

genreflex ${HEADERS} -o ${DICT} --noIncludePaths --select=${SELECTIONFILE} ${CXX_DEFINES} ${CXX_INCLUDES} $ADDITIONAL_CXX_FLAGS
rootcling --reflex --v2 -f ${DICT} ${HEADERS} ${SELECTIONFILE} --noIncludePaths --inlineInputHeader ${CXX_DEFINES} ${CXX_INCLUDES} $ADDITIONAL_CXX_FLAGS

# Generate bdm dictionary and append to DICT
BDM_DICT=$(mktemp)
Expand Down